e845db49e8
Approved by: sat (mentor, implicit) Obtained from: gentoo portage
79 lines
3.2 KiB
Text
79 lines
3.2 KiB
Text
diff -Naurp src/p_blowfish.c src/p_blowfish.c
|
|
--- src/p_blowfish.c 2007-02-26 12:16:53.000000000 +0000
|
|
+++ src/p_blowfish.c 2007-02-26 12:17:11.000000000 +0000
|
|
@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)$Id: p_blowfi
|
|
#include <string.h>
|
|
#include <config.h>
|
|
|
|
-char *strmncpy(char *dest, char *source, size_t len);
|
|
+char *strmncpy(char *dest, const char *source, size_t len);
|
|
char *lngtxt(int msgnum);
|
|
|
|
#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
|
|
diff -Naurp src/p_global.h src/p_global.h
|
|
--- src/p_global.h 2007-02-26 12:16:53.000000000 +0000
|
|
+++ src/p_global.h 2007-02-26 12:17:11.000000000 +0000
|
|
@@ -972,8 +972,8 @@ int checklogging(int usern);
|
|
#endif
|
|
|
|
#ifndef P_MEMORY
|
|
-unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
|
|
-void _pfree(void * pointer,char *module, char *function, int line);
|
|
+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line);
|
|
+void _pfree(void * pointer,char *module, const char *function, int line);
|
|
struct usert *user(int usern);
|
|
struct newpeert *newpeer(int usern);
|
|
struct datalinkt *datalink(int usern);
|
|
@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char
|
|
char *nobreak(char *tobreak);
|
|
char *randstring(int length);
|
|
char *strmcat(char *first,char *second);
|
|
-char *strmncpy(char *dest, char *source, unsigned int len);
|
|
+char *strmncpy(char *dest, const char *source, unsigned int len);
|
|
int strmncasecmp(char *one, char *two);
|
|
int strmcmp(char *one, char *two);
|
|
int strmwildcmp(char *line, char *wildcard);
|
|
diff -Naurp src/p_memory.c src/p_memory.c
|
|
--- src/p_memory.c 2007-02-26 12:16:53.000000000 +0000
|
|
+++ src/p_memory.c 2007-02-26 12:17:11.000000000 +0000
|
|
@@ -32,7 +32,7 @@ FILE *logm=NULL;
|
|
|
|
/* malloc-wrapper. No memory will log an error entry and kill the bouncer */
|
|
|
|
-unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line)
|
|
+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line)
|
|
{
|
|
unsigned long *rc;
|
|
if (!(rc=(unsigned long *)malloc(size)))
|
|
@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
|
|
return rc;
|
|
}
|
|
|
|
-void _pfree(unsigned long *pointer, char *module, char *function, int line)
|
|
+void _pfree(unsigned long *pointer, char *module, const char *function, int line)
|
|
{
|
|
#ifdef LOGALLOC
|
|
if(logm==NULL)
|
|
diff -Naurp src/p_string.c src/p_string.c
|
|
--- src/p_string.c 2007-02-26 12:16:53.000000000 +0000
|
|
+++ src/p_string.c 2007-02-26 12:17:11.000000000 +0000
|
|
@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
|
|
|
|
/* string copy with len and zero delimit */
|
|
|
|
-char *strmncpy(char *dest, char *source, unsigned int len)
|
|
+char *strmncpy(char *dest, const char *source, unsigned int len)
|
|
{
|
|
char bf[strlen(source)+2];
|
|
char *pt;
|
|
diff -Naurp src/match.c src/match.c
|
|
--- src/match.c 2007-02-26 12:26:10.000000000 +0000
|
|
+++ src/match.c 2007-02-26 12:26:17.000000000 +0000
|
|
@@ -36,6 +36,7 @@
|
|
/* Remove the next line to use this in IrcII */
|
|
#define EGGDROP
|
|
|
|
+#include <p_global.h>
|
|
|
|
/* ===================================================================
|
|
* Best to leave stuff after this point alone, but go on and change
|