psybnc/compile.diff

   1 diff -Naurp src/p_blowfish.c src/p_blowfish.c
   2 --- src/p_blowfish.c    2007-02-26 12:16:53.000000000 +0000
   3 +++ src/p_blowfish.c    2007-02-26 12:17:11.000000000 +0000
   4 @@ -31,7 +31,7 @@ static char rcsid[] = "@(#)$Id: p_blowfi
   5  #include <string.h>
   6  #include <config.h>
   7
   8 -char *strmncpy(char *dest, char *source, size_t len);
   9 +char *strmncpy(char *dest, const char *source, size_t len);
  10  char *lngtxt(int msgnum);
  11
  12  #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
  13 diff -Naurp src/p_global.h src/p_global.h
  14 --- src/p_global.h      2007-02-26 12:16:53.000000000 +0000
  15 +++ src/p_global.h      2007-02-26 12:17:11.000000000 +0000
  16 @@ -972,8 +972,8 @@ int checklogging(int usern);
  17  #endif
  18
  19  #ifndef P_MEMORY
  20 -unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
  21 -void _pfree(void * pointer,char *module, char *function, int line);
  22 +unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line);
  23 +void _pfree(void * pointer,char *module, const char *function, int line);
  24  struct usert *user(int usern);
  25  struct newpeert *newpeer(int usern);
  26  struct datalinkt *datalink(int usern);
  27 @@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char
  28  char *nobreak(char *tobreak);
  29  char *randstring(int length);
  30  char *strmcat(char *first,char *second);
  31 -char *strmncpy(char *dest, char *source, unsigned int len);
  32 +char *strmncpy(char *dest, const char *source, unsigned int len);
  33  int strmncasecmp(char *one, char *two);
  34  int strmcmp(char *one, char *two);
  35  int strmwildcmp(char *line, char *wildcard);
  36 diff -Naurp src/p_memory.c src/p_memory.c
  37 --- src/p_memory.c      2007-02-26 12:16:53.000000000 +0000
  38 +++ src/p_memory.c      2007-02-26 12:17:11.000000000 +0000
  39 @@ -32,7 +32,7 @@ FILE *logm=NULL;
  40
  41  /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
  42
  43 -unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line)
  44 +unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line)
  45  {
  46      unsigned long *rc;
  47      if (!(rc=(unsigned long *)malloc(size)))
  48 @@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
  49      return rc;
  50  }
  51
  52 -void _pfree(unsigned long *pointer, char *module, char *function, int line)
  53 +void _pfree(unsigned long *pointer, char *module, const char *function, int line)
  54  {
  55  #ifdef LOGALLOC
  56      if(logm==NULL)
  57 diff -Naurp src/p_string.c src/p_string.c
  58 --- src/p_string.c      2007-02-26 12:16:53.000000000 +0000
  59 +++ src/p_string.c      2007-02-26 12:17:11.000000000 +0000
  60 @@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
  61
  62  /* string copy with len and zero delimit */
  63
  64 -char *strmncpy(char *dest, char *source, unsigned int len)
  65 +char *strmncpy(char *dest, const char *source, unsigned int len)
  66  {
  67      char bf[strlen(source)+2];
  68      char *pt;
  69 diff -Naurp src/match.c src/match.c
  70 --- src/match.c 2007-02-26 12:26:10.000000000 +0000
  71 +++ src/match.c 2007-02-26 12:26:17.000000000 +0000
  72 @@ -36,6 +36,7 @@
  73  /* Remove the next line to use this in IrcII */
  74  #define EGGDROP
  75
  76 +#include <p_global.h>
  77
  78  /* ===================================================================
  79   * Best to leave stuff after this point alone, but go on and change