* More of the same

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 9f4be333c9161b86ea34ccc92186c38678aa20fd..149826d0aecf8975908cec5e6e2e1187d1800f25 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -409,7 +409,7 @@ int CtdlForEachMessage(int mode, long ref,
                /* Filter out messages that are moderated below the level
                 * currently being viewed at.
                 */
-               if (smi.smi_mod < moderation_level) {
+               if (smi.meta_mod < moderation_level) {
                        msglist[a] = 0L;
                }
 
@@ -417,7 +417,7 @@ int CtdlForEachMessage(int mode, long ref,
                 * out all messages which are not of the type requested.
                 */
                if (content_type != NULL) if (strlen(content_type) > 0) {
-                       if (strcasecmp(smi.smi_content_type, content_type)) {
+                       if (strcasecmp(smi.meta_content_type, content_type)) {
                                msglist[a] = 0L;
                        }
                }
@@ -1854,9 +1854,9 @@ long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
         */
        lprintf(9, "Creating MetaData record\n");
        memset(&smi, 0, sizeof(struct MetaData));
-       smi.smi_msgnum = newmsgid;
-       smi.smi_refcount = 0;
-       safestrncpy(smi.smi_content_type, content_type, 64);
+       smi.meta_msgnum = newmsgid;
+       smi.meta_refcount = 0;
+       safestrncpy(smi.meta_content_type, content_type, 64);
        PutMetaData(&smi);
 
        /* Now figure out where to store the pointers */
@@ -2445,7 +2445,7 @@ int CtdlDeleteMessages(char *room_name,           /* which room */
                                delete_this |= 0x02;
                        } else {
                                GetMetaData(&smi, msglist[i]);
-                               if (!strcasecmp(smi.smi_content_type,
+                               if (!strcasecmp(smi.meta_content_type,
                                                content_type)) {
                                        delete_this |= 0x02;
                                }
@@ -2587,8 +2587,8 @@ void GetMetaData(struct MetaData *smibuf, long msgnum)
        long TheIndex;
 
        memset(smibuf, 0, sizeof(struct MetaData));
-       smibuf->smi_msgnum = msgnum;
-       smibuf->smi_refcount = 1;       /* Default reference count is 1 */
+       smibuf->meta_msgnum = msgnum;
+       smibuf->meta_refcount = 1;      /* Default reference count is 1 */
 
        /* Use the negative of the message number for its supp record index */
        TheIndex = (0L - msgnum);
@@ -2613,10 +2613,10 @@ void PutMetaData(struct MetaData *smibuf)
        long TheIndex;
 
        /* Use the negative of the message number for its supp record index */
-       TheIndex = (0L - smibuf->smi_msgnum);
+       TheIndex = (0L - smibuf->meta_msgnum);
 
        lprintf(9, "PuttMetaData(%ld) - ref count is %d\n",
-               smibuf->smi_msgnum, smibuf->smi_refcount);
+               smibuf->meta_msgnum, smibuf->meta_refcount);
 
        cdb_store(CDB_MSGMAIN,
                  &TheIndex, sizeof(long),
@@ -2641,17 +2641,17 @@ void AdjRefCount(long msgnum, int incr)
        begin_critical_section(S_SUPPMSGMAIN);
        GetMetaData(&smi, msgnum);
        lprintf(9, "Ref count for message <%ld> before write is <%d>\n",
-               msgnum, smi.smi_refcount);
-       smi.smi_refcount += incr;
+               msgnum, smi.meta_refcount);
+       smi.meta_refcount += incr;
        PutMetaData(&smi);
        end_critical_section(S_SUPPMSGMAIN);
        lprintf(9, "Ref count for message <%ld> after write is <%d>\n",
-               msgnum, smi.smi_refcount);
+               msgnum, smi.meta_refcount);
 
        /* If the reference count is now zero, delete the message
         * (and its supplementary record as well).
         */
-       if (smi.smi_refcount == 0) {
+       if (smi.meta_refcount == 0) {
                lprintf(9, "Deleting message <%ld>\n", msgnum);
                delnum = msgnum;
                cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index 34a9fd521c62e83c52badc73b74d007d2160ce9d..10eb54e76832c374ee7551e3be5b0fdb945a4784 100644 (file)
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -632,7 +632,7 @@ void cmd_fsck(char *argbuf) {
                        cprintf("Message %7ld    ", msgnum);
 
                        GetMetaData(&smi, msgnum);
-                       cprintf("refcount=%-2d   ", smi.smi_refcount);
+                       cprintf("refcount=%-2d   ", smi.meta_refcount);
 
                        realcount = 0;
                        for (ptr = rr; ptr != NULL; ptr = ptr->next) {
@@ -640,9 +640,9 @@ void cmd_fsck(char *argbuf) {
                        }
                        cprintf("realcount=%-2d\n", realcount);
 
-                       if ( (smi.smi_refcount != realcount)
+                       if ( (smi.meta_refcount != realcount)
                           || (realcount == 0) ) {
-                               smi.smi_refcount = realcount;
+                               smi.meta_refcount = realcount;
                                PutMetaData(&smi);
                                AdjRefCount(msgnum, 0); /* deletes if needed */
                        }

diff --git a/citadel/serv_moderate.c b/citadel/serv_moderate.c
index 616a5ee4ebf587cc47360accdd5ce3d5eccc76aa..3e36e841201736b6f001ec20d948cd187a1e9d6a 100644 (file)
--- a/citadel/serv_moderate.c
+++ b/citadel/serv_moderate.c
@@ -76,7 +76,7 @@ void cmd_mmod(char *argbuf) {
        }
 
        GetMetaData(&smi, msgnum);
-       smi.smi_mod = newlevel;
+       smi.meta_mod = newlevel;
        PutMetaData(&smi);
 
        cprintf("%d Message %ld is moderated to %d\n", OK, msgnum, newlevel);

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index c8376047bf657161c166aaa1e5cbc743e3d7dc66..5c62567fad1d475fbea0a3f43e9b42fe17fa5c2e 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -195,9 +195,9 @@ void artv_export_message(long msgnum) {
        cprintf("message\n");
        GetMetaData(&smi, msgnum);
        cprintf("%ld\n", msgnum);
-       cprintf("%d\n", smi.smi_refcount);
-       cprintf("%s\n", smi.smi_content_type);
-       cprintf("%d\n", smi.smi_mod);
+       cprintf("%d\n", smi.meta_refcount);
+       cprintf("%s\n", smi.meta_content_type);
+       cprintf("%d\n", smi.meta_mod);
 
        serialize_message(&smr, msg);
        CtdlFreeMessage(msg);
@@ -473,10 +473,10 @@ void artv_import_message(void) {
 
        memset(&smi, 0, sizeof(struct MetaData));
        client_gets(buf);       msgnum = atol(buf);
-                               smi.smi_msgnum = msgnum;
-       client_gets(buf);       smi.smi_refcount = atoi(buf);
-       client_gets(smi.smi_content_type);
-       client_gets(buf);       smi.smi_mod = atoi(buf);
+                               smi.meta_msgnum = msgnum;
+       client_gets(buf);       smi.meta_refcount = atoi(buf);
+       client_gets(smi.meta_content_type);
+       client_gets(buf);       smi.meta_mod = atoi(buf);
 
        lprintf(7, "message #%ld\n", msgnum);
 

diff --git a/citadel/server.h b/citadel/server.h
index 07e57315f1c54ae3d49720089616634f286d588c..cf2dc329a87067c99bbf64af0a252a46be83e82c 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -390,10 +390,10 @@ struct visit {
  * fields whose values may change at some point after the message is saved.)
  */
 struct MetaData {
-       long smi_msgnum;        /* Message number in *local* message base */
-       int smi_refcount;       /* Number of rooms which point to this msg */
-       char smi_content_type[64];
-       char smi_mod;           /* Moderated to what level? */
+       long meta_msgnum;       /* Message number in *local* message base */
+       int meta_refcount;      /* Number of rooms which point to this msg */
+       char meta_content_type[64];
+       char meta_mod;          /* Moderated to what level? */
        /* more stuff will be added to this record in the future */
 };