* Moved num_parms() and all the extract() type functions into tools.c

[citadel.git] / citadel / netpoll.c

diff --git a/citadel/netpoll.c b/citadel/netpoll.c
index 2a25d12c512bd1f19d67beb14142275fab5a351e..1874ecb610ca674e4fdafb2270d15b7b0e2cb45e 100644 (file)
--- a/citadel/netpoll.c
+++ b/citadel/netpoll.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <errno.h>
 #include "citadel.h"
+#include "tools.h"
 
 /*
  * This variable defines the amount of network spool data that may be carried
@@ -24,73 +25,6 @@ void get_config(void);
 struct config config;
 
 
-/*
- * num_parms()  -  discover number of parameters...
- */
-int num_parms(char *source)
-{
-       int a;
-       int count = 1;
-
-       for (a=0; a<strlen(source); ++a) 
-               if (source[a]=='|') ++count;
-       return(count);
-       }
-
-
-/*
- * extract()  -  extract a parameter from a series of "|" separated...
- */
-void extract(char *dest, char *source, int parmnum)
-{
-       char buf[256];
-       int count = 0;
-       int n;
-
-       n = num_parms(source);
-
-       if (parmnum >= n) {
-               strcpy(dest,"");
-               return;
-               }
-       strcpy(buf,source);
-       if ( (parmnum == 0) && (n == 1) ) {
-               strcpy(dest,buf);
-               return;
-               }
-
-       while (count++ < parmnum) do {
-               strcpy(buf,&buf[1]);
-               } while( (strlen(buf)>0) && (buf[0]!='|') );
-       if (buf[0]=='|') strcpy(buf,&buf[1]);
-       for (count = 0; count<strlen(buf); ++count)
-               if (buf[count] == '|') buf[count] = 0;
-       strcpy(dest,buf);
-       }
-
-/*
- * extract_int()  -  extract an int parm w/o supplying a buffer
- */
-int extract_int(char *source, int parmnum)
-{
-       char buf[256];
-       
-       extract(buf,source,parmnum);
-       return(atoi(buf));
-       }
-
-/*
- * extract_long()  -  extract a long parm w/o supplying a buffer
- */
-long extract_long(char *source, int parmnum)
-{
-       char buf[256];
-       
-       extract(buf,source,parmnum);
-       return(atol(buf));
-       }
-
-
 void logoff(int code)
 {
        exit(code);