From 5b11c8b181edc104ddfec6e7ba088d0c2aad4f06 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sun, 1 Feb 2015 23:22:38 +0200
Subject: [PATCH] Namespace error enums.

---
 bin/server.c | 52 ++++++++++++++++++-------------------
 src/pi9.c    | 72 ++++++++++++++++++++++++++--------------------------
 src/pi9.h    | 20 +++++++--------
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/bin/server.c b/bin/server.c
index 4f373df..7477291 100644
--- a/bin/server.c
+++ b/bin/server.c
@@ -404,16 +404,16 @@ cb_attach(struct pi9 *pi9, uint16_t tag, uint32_t fid, uint32_t afid, const stru
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_oom:
-   pi9_write_error(tag, ERR_OUT_OF_MEMORY, pi9->out);
+   pi9_write_error(tag, PI9_ERR_OUT_OF_MEMORY, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 err_no_auth:
-   pi9_write_error(tag, ERR_NO_AUTH, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_AUTH, pi9->out);
    return false;
 }
 
@@ -510,16 +510,16 @@ cb_walk(struct pi9 *pi9, uint16_t tag, uint32_t fid, uint32_t newfid, uint16_t n
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_fid_in_use:
-   pi9_write_error(tag, ERR_FID_IN_USE, pi9->out);
+   pi9_write_error(tag, PI9_ERR_FID_IN_USE, pi9->out);
    return false;
 err_not_directory:
-   pi9_write_error(tag, ERR_NOT_DIRECTORY, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_DIRECTORY, pi9->out);
    return false;
 err_oom:
-   pi9_write_error(tag, ERR_OUT_OF_MEMORY, pi9->out);
+   pi9_write_error(tag, PI9_ERR_OUT_OF_MEMORY, pi9->out);
    return false;
 }
 
@@ -558,10 +558,10 @@ cb_open(struct pi9 *pi9, uint16_t tag, uint32_t fid, uint8_t mode, struct pi9_qi
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
@@ -607,14 +607,14 @@ cb_create(struct pi9 *pi9, uint16_t tag, uint32_t fid, const struct pi9_string *
    // (out_iounit is by default 0)
 
    // FIXME: creation code here
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
@@ -636,13 +636,13 @@ cb_read(struct pi9 *pi9, uint16_t tag, uint32_t fid, uint64_t offset, uint32_t c
    return true;
 
 err_write:
-   pi9_write_error(tag, ERR_WRITE, pi9->out);
+   pi9_write_error(tag, PI9_ERR_WRITE, pi9->out);
    return false;
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
@@ -669,13 +669,13 @@ cb_write(struct pi9 *pi9, uint16_t tag, uint32_t fid, uint64_t offset, uint32_t
    return true;
 
 err_write:
-   pi9_write_error(tag, ERR_WRITE, pi9->out);
+   pi9_write_error(tag, PI9_ERR_WRITE, pi9->out);
    return false;
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
@@ -695,7 +695,7 @@ cb_clunk(struct pi9 *pi9, uint16_t tag, uint32_t fid)
    return true;
 
 err_oom:
-   pi9_write_error(tag, ERR_OUT_OF_MEMORY, pi9->out);
+   pi9_write_error(tag, PI9_ERR_OUT_OF_MEMORY, pi9->out);
    return false;
 }
 
@@ -726,13 +726,13 @@ cb_remove(struct pi9 *pi9, uint16_t tag, uint32_t fid)
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_oom:
-   pi9_write_error(tag, ERR_OUT_OF_MEMORY, pi9->out);
+   pi9_write_error(tag, PI9_ERR_OUT_OF_MEMORY, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
@@ -755,7 +755,7 @@ cb_stat(struct pi9 *pi9, uint16_t tag, uint32_t fid, struct pi9_stat **out_stat)
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 }
 
@@ -845,10 +845,10 @@ cb_twstat(struct pi9 *pi9, uint16_t tag, uint32_t fid, const struct pi9_stat *st
    return true;
 
 err_nofid:
-   pi9_write_error(tag, ERR_NO_FID, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NO_FID, pi9->out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, pi9->out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, pi9->out);
    return false;
 }
 
diff --git a/src/pi9.c b/src/pi9.c
index da62e5d..d0d2736 100644
--- a/src/pi9.c
+++ b/src/pi9.c
@@ -89,7 +89,7 @@ static struct {
 static const struct {
    const char *msg;
    size_t size;
-} errors[ERR_LAST] = {
+} errors[PI9_ERR_LAST] = {
 #define MSG(x) { x, sizeof(x) }
    MSG("Could not read message."),
    MSG("Could not write message."),
@@ -197,13 +197,13 @@ op_Tversion(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_b
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, out);
    return false;
 }
 
@@ -250,13 +250,13 @@ op_Tauth(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buff
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_no_auth:
-   pi9_write_error(tag, ERR_NO_AUTH, out);
+   pi9_write_error(tag, PI9_ERR_NO_AUTH, out);
    return false;
 }
 
@@ -301,10 +301,10 @@ op_Tattach(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_bu
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -335,10 +335,10 @@ op_Tflush(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buf
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -391,13 +391,13 @@ op_Twalk(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buff
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, out);
    return false;
 }
 
@@ -436,13 +436,13 @@ op_Topen(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buff
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, out);
    return false;
 }
 
@@ -491,13 +491,13 @@ op_Tcreate(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_bu
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_not_allowed:
-   pi9_write_error(tag, ERR_NOT_ALLOWED, out);
+   pi9_write_error(tag, PI9_ERR_NOT_ALLOWED, out);
    return false;
 }
 
@@ -533,10 +533,10 @@ op_Tread(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buff
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -567,10 +567,10 @@ op_Twrite(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buf
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -596,10 +596,10 @@ op_Tclunk(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buf
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -625,10 +625,10 @@ op_Tremove(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_bu
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -669,10 +669,10 @@ op_Tstat(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buff
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -704,10 +704,10 @@ op_Twstat(struct pi9 *pi9, uint16_t tag, struct chck_buffer *in, struct chck_buf
    return true;
 
 err_read:
-   pi9_write_error(tag, ERR_READ, out);
+   pi9_write_error(tag, PI9_ERR_READ, out);
    return false;
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 }
 
@@ -731,10 +731,10 @@ call_op(struct pi9 *pi9, enum op op, uint16_t tag, struct chck_buffer *in, struc
    return ops[op].cb(pi9, tag, in, out);
 
 err_write:
-   pi9_write_error(tag, ERR_WRITE, out);
+   pi9_write_error(tag, PI9_ERR_WRITE, out);
    return false;
 err_unknown_op:
-   pi9_write_error(tag, ERR_UNKNOWN_OP, out);
+   pi9_write_error(tag, PI9_ERR_UNKNOWN_OP, out);
    return false;
 }
 
@@ -837,12 +837,12 @@ pi9_process(struct pi9 *pi9, int32_t fd)
    bool ret = true;
    if (!read_msg(pi9, fd, pi9->in, pi9->out)) {
       if (pi9->out->curpos == pi9->out->buffer)
-         pi9_write_error(NOTAG, ERR_READ, pi9->out);
+         pi9_write_error(NOTAG, PI9_ERR_READ, pi9->out);
       ret = false;
    }
 
    if (!write_msg(fd, pi9->out)) {
-      pi9_write_error(NOTAG, ERR_WRITE, pi9->out);
+      pi9_write_error(NOTAG, PI9_ERR_WRITE, pi9->out);
       write_msg(fd, pi9->out);
       ret = false;
    }
diff --git a/src/pi9.h b/src/pi9.h
index 45f04f8..18eda73 100644
--- a/src/pi9.h
+++ b/src/pi9.h
@@ -93,16 +93,16 @@ enum {
 };
 
 enum pi9_error {
-   ERR_READ,
-   ERR_WRITE,
-   ERR_NO_AUTH,
-   ERR_NOT_DIRECTORY,
-   ERR_NO_FID,
-   ERR_FID_IN_USE,
-   ERR_NOT_ALLOWED,
-   ERR_UNKNOWN_OP,
-   ERR_OUT_OF_MEMORY,
-   ERR_LAST,
+   PI9_ERR_READ,
+   PI9_ERR_WRITE,
+   PI9_ERR_NO_AUTH,
+   PI9_ERR_NOT_DIRECTORY,
+   PI9_ERR_NO_FID,
+   PI9_ERR_FID_IN_USE,
+   PI9_ERR_NOT_ALLOWED,
+   PI9_ERR_UNKNOWN_OP,
+   PI9_ERR_OUT_OF_MEMORY,
+   PI9_ERR_LAST,
 };
 
 bool pi9_write_stat(struct pi9_stat *stat, struct chck_buffer *out);