Use snac_op in grave().

5 files changed, 13 insertions, 10 deletions

diff --git a/activitypub.c b/activitypub.c
index 8155fe4..df319f0 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -3951,7 +3951,7 @@ int activitypub_get_handler(const xs_dict *req, const char *q_path,
     uid = xs_list_get(l, 1);
     if (!user_open(&snac, uid)) {
         /* invalid user */
-        status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
+        status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
         srv_debug(1, xs_fmt("activitypub_get_handler bad user %s %d", uid, status));
         return status;
     }
@@ -4151,7 +4151,7 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
     const char *uid = xs_list_get(l, 1);
     if (!user_open(&snac, uid)) {
         /* invalid user */
-        status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
+        status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
         srv_debug(1, xs_fmt("activitypub_post_handler bad user %s %d", uid, status));
         return status;
     }
diff --git a/data.c b/data.c
index 3736bc9..333ed31 100644
--- a/data.c
+++ b/data.c
@@ -3329,7 +3329,7 @@ int instance_failure(const char *url, snac_op op)
 }
 
 
-int grave(const char *objid, int op)
+int grave(const char *objid, snac_op op)
 /* the graveyeard of deleted objects */
 {
     int ret = 0;
@@ -3339,11 +3339,11 @@ int grave(const char *objid, int op)
     FILE *f;
 
     switch (op) {
-    case 0: /** check **/
+    case OP_CHECK: /** check **/
         ret = mtime(fn) > 0.0 ? 1 : 0;
         break;
 
-    case 1: /** add **/
+    case OP_ADD: /** add **/
         mkdirx(dir);
 
         if ((f = fopen(fn, "w")) != NULL) {
@@ -3353,9 +3353,12 @@ int grave(const char *objid, int op)
 
         break;
 
-    case 2: /** del **/
+    case OP_DEL: /** del **/
         unlink(fn);
         break;
+
+    default:
+        break;
     }
 
     return ret;
diff --git a/html.c b/html.c
index f18e233..8f177cc 100644
--- a/html.c
+++ b/html.c
@@ -4717,7 +4717,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
 
     if (!uid || !user_open(&snac, uid)) {
         /* invalid user */
-        status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
+        status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
         srv_debug(2, xs_fmt("html_get_handler bad user '%s' %d", xs_or(uid, "(null)"), status));
         return status;
     }
diff --git a/snac.h b/snac.h
index d21c7ad..84223e6 100644
--- a/snac.h
+++ b/snac.h
@@ -311,7 +311,7 @@ xs_list *content_search(snac *user, const char *regex,
 int actor_failure(const char *actor, snac_op op);
 int instance_failure(const char *url, snac_op op);
 
-int grave(const char *objid, int op);
+int grave(const char *objid, snac_op op);
 
 void enqueue_input(snac *snac, const xs_dict *msg, const xs_dict *req, int retries);
 void enqueue_shared_input(const xs_dict *msg, const xs_dict *req, int retries);
diff --git a/utils.c b/utils.c
index 6941081..c1855b2 100644
--- a/utils.c
+++ b/utils.c
@@ -372,7 +372,7 @@ int adduser(const char *uid)
     }
 
     /* remove the grave */
-    grave(uid, 2);
+    grave(uid, OP_DEL);
 
     printf("\nUser password is %s\n", pwd);
 
@@ -467,7 +467,7 @@ int deluser(snac *user)
         }
     }
 
-    grave(user->uid, 1);
+    grave(user->uid, OP_ADD);
 
     rm_rf(user->basedir);