projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relocate ijb_isdigit()'s definition to project.h
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
58f0c64
..
de423aa
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,4
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.
66 2011/05/22 10:26:45
fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.
70 2012/03/04 11:48:34
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@
-12,7
+12,7
@@
const char miscutil_rcs[] = "$Id: miscutil.c,v 1.66 2011/05/22 10:26:45 fabianke
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
* The timegm replacement function was taken from GnuPG,
* Junkbusters Corporation. http://www.junkbusters.com
*
* The timegm replacement function was taken from GnuPG,
@@
-23,7
+23,7
@@
const char miscutil_rcs[] = "$Id: miscutil.c,v 1.66 2011/05/22 10:26:45 fabianke
* used under the terms of the GPL or the terms of the
* "Frontier Artistic License".
*
* used under the terms of the GPL or the terms of the
* "Frontier Artistic License".
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
@@
-72,7
+72,6
@@
const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
* Function : zalloc
*
* Description : Malloc some memory and set it to '\0'.
* Function : zalloc
*
* Description : Malloc some memory and set it to '\0'.
- * The way calloc() ought to be -acjc
*
* Parameters :
* 1 : size = Size of memory chunk to return.
*
* Parameters :
* 1 : size = Size of memory chunk to return.
@@
-97,19
+96,19
@@
void *zalloc(size_t size)
#if defined(unix)
/*********************************************************************
*
#if defined(unix)
/*********************************************************************
*
- * Function : write_pid_file
+ * Function : write_pid_file
*
*
- * Description : Writes a pid file with the pid of the main process
+ * Description : Writes a pid file with the pid of the main process
*
* Parameters : None
*
*
* Parameters : None
*
- * Returns : N/A
+ * Returns : N/A
*
*********************************************************************/
void write_pid_file(void)
{
FILE *fp;
*
*********************************************************************/
void write_pid_file(void)
{
FILE *fp;
-
+
/*
* If no --pidfile option was given,
* we can live without one.
/*
* If no --pidfile option was given,
* we can live without one.
@@
-136,18
+135,17
@@
void write_pid_file(void)
* Function : hash_string
*
* Description : Take a string and compute a (hopefuly) unique numeric
* Function : hash_string
*
* Description : Take a string and compute a (hopefuly) unique numeric
- * integer value. This has several uses, but being able
- * to "switch" a string the one of my favorites.
+ * integer value. This is useful to "switch" a string.
*
* Parameters :
* 1 : s : string to be hashed.
*
*
* Parameters :
* 1 : s : string to be hashed.
*
- * Returns :
an unsigned long variable with the hashed value.
+ * Returns :
The string's hash
*
*********************************************************************/
unsigned int hash_string( const char* s )
{
*
*********************************************************************/
unsigned int hash_string( const char* s )
{
- unsigned int h = 0;
+ unsigned int h = 0;
for ( ; *s; ++s )
{
for ( ; *s; ++s )
{
@@
-209,7
+207,7
@@
int strncmpic(const char *s1, const char *s2, size_t n)
if (n <= (size_t)0) return(0);
if (!s1) s1 = "";
if (!s2) s2 = "";
if (n <= (size_t)0) return(0);
if (!s1) s1 = "";
if (!s2) s2 = "";
-
+
while (*s1 && *s2)
{
if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) )
while (*s1 && *s2)
{
if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) )
@@
-243,7
+241,7
@@
char *chomp(char *string)
{
char *p, *q, *r;
{
char *p, *q, *r;
- /*
+ /*
* strip trailing whitespace
*/
p = string + strlen(string);
* strip trailing whitespace
*/
p = string + strlen(string);
@@
-253,8
+251,8
@@
char *chomp(char *string)
}
*p = '\0';
}
*p = '\0';
- /*
- * find end of leading whitespace
+ /*
+ * find end of leading whitespace
*/
q = r = string;
while (*q && ijb_isspace(*q))
*/
q = r = string;
while (*q && ijb_isspace(*q))
@@
-282,7
+280,7
@@
char *chomp(char *string)
*
* Function : string_append
*
*
* Function : string_append
*
- * Description : Reallocate target_string and append text to it.
+ * Description : Reallocate target_string and append text to it.
* This makes it easier to append to malloc'd strings.
* This is similar to the (removed) strsav(), but
* running out of memory isn't catastrophic.
* This makes it easier to append to malloc'd strings.
* This is similar to the (removed) strsav(), but
* running out of memory isn't catastrophic.
@@
-427,7
+425,7
@@
jb_err string_join(char **target_string, char *text_to_append)
* Parameters :
* 1 : string = string to convert
*
* Parameters :
* 1 : string = string to convert
*
- * Returns : Uppercase copy of string if possible,
+ * Returns : Uppercase copy of string if possible,
* NULL on out-of-memory or if string was NULL.
*
*********************************************************************/
* NULL on out-of-memory or if string was NULL.
*
*********************************************************************/
@@
-440,7
+438,7
@@
char *string_toupper(const char *string)
{
return NULL;
}
{
return NULL;
}
-
+
q = string;
p = result;
q = string;
p = result;
@@
-472,13
+470,10
@@
char *bindup(const char *string, size_t len)
{
char *duplicate;
{
char *duplicate;
- if (NULL == (duplicate = (char *)malloc(len)))
+ duplicate = (char *)malloc(len);
+ if (NULL != duplicate)
{
{
- return NULL;
- }
- else
- {
- memcpy(duplicate, string, len);
+ memcpy(duplicate, string, len);
}
return duplicate;
}
return duplicate;
@@
-490,11
+485,11
@@
char *bindup(const char *string, size_t len)
*
* Function : make_path
*
*
* Function : make_path
*
- * Description : Takes a directory name and a file name, returns
+ * Description : Takes a directory name and a file name, returns
* the complete path. Handles windows/unix differences.
* If the file name is already an absolute path, or if
* the complete path. Handles windows/unix differences.
* If the file name is already an absolute path, or if
- * the directory name is NULL or empty, it returns
- * the filename.
+ * the directory name is NULL or empty, it returns
+ * the filename.
*
* Parameters :
* 1 : dir: Name of directory or NULL for none.
*
* Parameters :
* 1 : dir: Name of directory or NULL for none.
@@
-503,7
+498,7
@@
char *bindup(const char *string, size_t len)
* Returns : "dir/file" (Or on windows, "dir\file").
* It allocates the string on the heap. Caller frees.
* Returns NULL in error (i.e. NULL file or out of
* Returns : "dir/file" (Or on windows, "dir\file").
* It allocates the string on the heap. Caller frees.
* Returns NULL in error (i.e. NULL file or out of
- * memory)
+ * memory)
*
*********************************************************************/
char * make_path(const char * dir, const char * file)
*
*********************************************************************/
char * make_path(const char * dir, const char * file)
@@
-616,7
+611,7
@@
char * make_path(const char * dir, const char * file)
* Parameters :
* 1 : range: Highest possible number to pick.
*
* Parameters :
* 1 : range: Highest possible number to pick.
*
- * Returns : Picked number.
+ * Returns : Picked number.
*
*********************************************************************/
long int pick_from_range(long int range)
*
*********************************************************************/
long int pick_from_range(long int range)
@@
-632,7
+627,7
@@
long int pick_from_range(long int range)
if (range <= 0) return 0;
#ifdef HAVE_RANDOM
if (range <= 0) return 0;
#ifdef HAVE_RANDOM
- number = random() % range + 1;
+ number = random() % range + 1;
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&rand_mutex);
#ifdef _WIN32
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&rand_mutex);
#ifdef _WIN32
@@
-736,7
+731,7
@@
size_t privoxy_strlcat(char *destination, const char *source, const size_t size)
* Parameters :
* 1 : tm: Broken-down time struct.
*
* Parameters :
* 1 : tm: Broken-down time struct.
*
- * Returns : tm converted into time_t seconds.
+ * Returns : tm converted into time_t seconds.
*
*********************************************************************/
time_t timegm(struct tm *tm)
*
*********************************************************************/
time_t timegm(struct tm *tm)
@@
-788,7
+783,7
@@
time_t timegm(struct tm *tm)
snprintf.c
- a portable implementation of snprintf,
including vsnprintf.c, asnprintf, vasnprintf, asprintf, vasprintf
snprintf.c
- a portable implementation of snprintf,
including vsnprintf.c, asnprintf, vasnprintf, asprintf, vasprintf
-
+
snprintf is a routine to convert numeric and string arguments to
formatted strings. It is similar to sprintf(3) provided in a system's
C library, yet it requires an additional argument - the buffer size -
snprintf is a routine to convert numeric and string arguments to
formatted strings. It is similar to sprintf(3) provided in a system's
C library, yet it requires an additional argument - the buffer size -
@@
-1430,7
+1425,7
@@
int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
}
}
/* zero padding to specified precision? */
}
}
/* zero padding to specified precision? */
- if (num_of_digits < precision)
+ if (num_of_digits < precision)
number_of_zeros_to_pad = precision - num_of_digits;
}
/* zero padding to specified minimal field width? */
number_of_zeros_to_pad = precision - num_of_digits;
}
/* zero padding to specified minimal field width? */