X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=ec4de4fd4a94495948c810af096602c4bb754be1;hp=74b894b73cd61181b432bbf577f45d2081d3cca3;hb=7c92bc543149f004ea3105f9b9953158500767ab;hpb=571a3b8fe07c86d3995651422ffe6e14cfecff0a diff --git a/miscutil.c b/miscutil.c index 74b894b7..ec4de4fd 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.31 2002/03/05 04:52:42 oes Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -10,7 +10,7 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.31 2002/03/05 04:52:42 oes Exp * but don't really fit in any other file. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,15 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.31 2002/03/05 04:52:42 oes Exp * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.34 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.33 2002/03/07 03:46:53 oes + * Fixed compiler warnings etc + * + * Revision 1.32 2002/03/06 23:02:57 jongfoster + * Removing tabs + * * Revision 1.31 2002/03/05 04:52:42 oes * Deleted non-errlog debugging code * @@ -217,7 +226,7 @@ const char miscutil_h_rcs[] = MISCUTIL_H_VERSION; * Returns : Pointer to newly malloc'd memory chunk. * *********************************************************************/ -void *zalloc(int size) +void *zalloc(size_t size) { void * ret; @@ -500,10 +509,10 @@ char *chomp(char *string) *********************************************************************/ char *strsav(char *old, const char *text_to_append) { - int old_len, new_len = 0; + size_t old_len, new_len = 0; char *p; - if (( text_to_append == NULL) || (*text_to_append == '\0')) + if ((text_to_append == NULL) || (*text_to_append == '\0')) { return(old); } @@ -512,7 +521,7 @@ char *strsav(char *old, const char *text_to_append) { if ((p = strdup(text_to_append)) == NULL) { - log_error(LOG_LEVEL_FATAL, "strdup() failed!", new_len); + log_error(LOG_LEVEL_FATAL, "strdup() failed!"); /* Never get here - LOG_LEVEL_FATAL causes program exit */ } return p; @@ -794,25 +803,25 @@ int simplematch(char *pattern, char *text) * * Parameters : * 1 : string = string to be duplicated - * 2 : n = number of bytes to duplicate + * 2 : len = number of bytes to duplicate * * Returns : pointer to copy, or NULL if failiure * *********************************************************************/ -char *bindup(const char *string, int n) +char *bindup(const char *string, size_t len) { - char *dup; + char *duplicate; - if (NULL == (dup = (char *)malloc(n))) + if (NULL == (duplicate = (char *)malloc(len))) { return NULL; } else { - memcpy(dup, string, n); + memcpy(duplicate, string, len); } - return dup; + return duplicate; }