* use the just commited defines; append -policy to the commandnames so its uniq

diff --git a/citadel/include/citadel_ipc.h b/citadel/include/citadel_ipc.h
index 97614927fcd1bcf41414712b34eef5c29ce2da02..dc05dc885dd6be89f1cd6c654fa0f9a3a1a3d6d3 100644 (file)
--- a/citadel/include/citadel_ipc.h
+++ b/citadel/include/citadel_ipc.h
@@ -310,7 +310,7 @@ int CtdlIPCAideGetUserParameters(CtdlIPC *ipc, const char *who,
                                 struct ctdluser **uret, char *cret);
 int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct ctdluser *uret, char *cret);
 int CtdlIPCRenameUser(CtdlIPC *ipc, char *oldname, char *newname, char *cret);
-int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, int which,
+int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, GPEXWhichPolicy which,
                struct ExpirePolicy **policy, char *cret);
 int CtdlIPCSetMessageExpirationPolicy(CtdlIPC *ipc, int which,
                struct ExpirePolicy *policy, char *cret);

diff --git a/citadel/policy.c b/citadel/policy.c
index 52d3c697d894af4979a05bcac46b3bab6d4b9425..c85383cb8842df29da52c84e1db669580cfa35f9 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -85,17 +85,17 @@ void cmd_gpex(char *argbuf) {
        char which[128];
 
        extract_token(which, argbuf, 0, '|', sizeof which);
-       if (!strcasecmp(which, "room")) {
+       if (!strcasecmp(which, strof(room))) {
                memcpy(&exp, &CC->room.QRep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "floor")) {
+       else if (!strcasecmp(which, strof(floorpolicy))) {
                fl = CtdlGetCachedFloor(CC->room.QRfloor);
                memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "mailboxes")) {
+       else if (!strcasecmp(which, strof(mailboxespolicy))) {
                memcpy(&exp, &config.c_mbxep, sizeof(struct ExpirePolicy));
        }
-       else if (!strcasecmp(which, "site")) {
+       else if (!strcasecmp(which, strof(sitepolicy))) {
                memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy));
        }
        else {
@@ -144,7 +144,7 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       if (!strcasecmp(which, "floor")) {
+       if (!strcasecmp(which, strof(floorpolicy))) {
                lgetfloor(&flbuf, CC->room.QRfloor);
                memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
                lputfloor(&flbuf, CC->room.QRfloor);
@@ -152,7 +152,7 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       else if (!strcasecmp(which, "mailboxes")) {
+       else if (!strcasecmp(which, strof(mailboxespolicy))) {
                memcpy(&config.c_mbxep, &exp, sizeof(struct ExpirePolicy));
                put_config();
                cprintf("%d Default expire policy for mailboxes set.\n",
@@ -160,7 +160,7 @@ void cmd_spex(char *argbuf) {
                return;
        }
 
-       else if (!strcasecmp(which, "site")) {
+       else if (!strcasecmp(which, strof(sitepolicy))) {
                if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
                        cprintf("%d Invalid policy (no higher level)\n",
                                ERROR + ILLEGAL_VALUE);

diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index a1d8abd7546f0c477d62725f061458e36fc40684..0924261c99db5d237f660946c896acae00062bd9 100644 (file)
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -21,6 +21,7 @@
 #ifndef HAVE_SNPRINTF
 #include "snprintf.h"
 #endif
+#include <libcitadel.h>
 #include "citadel.h"
 #include "citadel_ipc.h"
 #include "citadel_decls.h"

diff --git a/citadel/utillib/citadel_ipc.c b/citadel/utillib/citadel_ipc.c
index 67f6d6991543ac70cb01fc17db244fd0c6d494d9..19bac8d1103ca32ab7a9f9955d36a2c1943ee109 100644 (file)
--- a/citadel/utillib/citadel_ipc.c
+++ b/citadel/utillib/citadel_ipc.c
@@ -1860,10 +1860,15 @@ int CtdlIPCAideSetUserParameters(CtdlIPC *ipc, const struct ctdluser *uret, char
 /* GPEX */
 /* which is 0 = room, 1 = floor, 2 = site, 3 = default for mailboxes */
 /* caller must free the struct ExpirePolicy */
-int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, int which,
+int CtdlIPCGetMessageExpirationPolicy(CtdlIPC *ipc, GPEXWhichPolicy which,
                struct ExpirePolicy **policy, char *cret)
 {
-       static char *proto[] = {"room", "floor", "site", "mailboxes" };
+       static char *proto[] = {
+               strof(roompolicy),
+               strof(floorpolicy),
+               strof(sitepolicy),
+               strof(mailboxespolicy)
+       };
        char cmd[256];
        register int ret;