Move function where its used.

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 0edb1f11efa0e240bcf7c7c3d79ead11d21b3934..df1c225dfa0846686281608c87c09c2574842fdf 100644 (file)
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -434,6 +434,53 @@ void network_spoolout_room(SpoolControl *sc)
        }
 }
 
+
+/*
+ * Check the use table.  This is a list of messages which have recently
+ * arrived on the system.  It is maintained and queried to prevent the same
+ * message from being entered into the database multiple times if it happens
+ * to arrive multiple times by accident.
+ */
+int network_usetable(struct CtdlMessage *msg)
+{
+       StrBuf *msgid;
+       struct CitContext *CCC = CC;
+       time_t now;
+
+       /* Bail out if we can't generate a message ID */
+       if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
+       {
+               return(0);
+       }
+
+       /* Generate the message ID */
+       msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
+       if (haschar(ChrPtr(msgid), '@') == 0) {
+               StrBufAppendBufPlain(msgid, HKEY("@"), 0);
+               if (!CM_IsEmpty(msg, eNodeName)) {
+                       StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
+               }
+               else {
+                       FreeStrBuf(&msgid);
+                       return(0);
+               }
+       }
+       now = time(NULL);
+       if (CheckIfAlreadySeen("Networker Import",
+                              msgid,
+                              now, 0,
+                              eCheckUpdate,
+                              CCC->cs_pid, 0) != 0)
+       {
+               FreeStrBuf(&msgid);
+               return(1);
+       }
+       FreeStrBuf(&msgid);
+
+       return(0);
+}
+
+
 /*
  * Process a buffer containing a single message from a single file
  * from the inbound queue 

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 9fa82734e8a278d52ba71bf5669164250177b36c..c61d225931a36b6327205295d10d90c1eb548f86 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -96,54 +96,6 @@ typedef struct __roomlists {
 struct RoomProcList *rplist = NULL;
 
 
-
-/*
- * Check the use table.  This is a list of messages which have recently
- * arrived on the system.  It is maintained and queried to prevent the same
- * message from being entered into the database multiple times if it happens
- * to arrive multiple times by accident.
- */
-int network_usetable(struct CtdlMessage *msg)
-{
-       StrBuf *msgid;
-       struct CitContext *CCC = CC;
-       time_t now;
-
-       /* Bail out if we can't generate a message ID */
-       if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
-       {
-               return(0);
-       }
-
-       /* Generate the message ID */
-       msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
-       if (haschar(ChrPtr(msgid), '@') == 0) {
-               StrBufAppendBufPlain(msgid, HKEY("@"), 0);
-               if (!CM_IsEmpty(msg, eNodeName)) {
-                       StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
-               }
-               else {
-                       FreeStrBuf(&msgid);
-                       return(0);
-               }
-       }
-       now = time(NULL);
-       if (CheckIfAlreadySeen("Networker Import",
-                              msgid,
-                              now, 0,
-                              eCheckUpdate,
-                              CCC->cs_pid, 0) != 0)
-       {
-               FreeStrBuf(&msgid);
-               return(1);
-       }
-       FreeStrBuf(&msgid);
-
-       return(0);
-}
-
-
-
 /*
  * Send the *entire* contents of the current room to one specific network node,
  * ignoring anything we know about which messages have already undergone

diff --git a/citadel/modules/network/serv_network.h b/citadel/modules/network/serv_network.h
index 7de793905f76699979d801c97b1f105940af756e..7116eba8b0244943dcf8904bc9952ed3900a28e5 100644 (file)
--- a/citadel/modules/network/serv_network.h
+++ b/citadel/modules/network/serv_network.h
@@ -40,5 +40,4 @@ void load_network_filter_list(void);
 void network_queue_room(struct ctdlroom *, void *);
 ////void destroy_network_queue_room(void);
 void network_bounce(struct CtdlMessage *msg, char *reason);
-int network_usetable(struct CtdlMessage *msg);