projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove user junkbuster after de-installation.
[privoxy.git]
/
miscutil.c
diff --git
a/miscutil.c
b/miscutil.c
index
bb5677e
..
f79083e
100644
(file)
--- a/
miscutil.c
+++ b/
miscutil.c
@@
-1,4
+1,4
@@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.3
0 2002/03/04 18:27:42 oes
Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.3
2 2002/03/06 23:02:57 jongfoster
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@
-36,6
+36,12
@@
const char miscutil_rcs[] = "$Id: miscutil.c,v 1.30 2002/03/04 18:27:42 oes Exp
*
* Revisions :
* $Log: miscutil.c,v $
*
* Revisions :
* $Log: miscutil.c,v $
+ * 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
+ *
* Revision 1.30 2002/03/04 18:27:42 oes
* - Deleted deletePidFile
* - Made write_pid_file use the --pidfile option value
* Revision 1.30 2002/03/04 18:27:42 oes
* - Deleted deletePidFile
* - Made write_pid_file use the --pidfile option value
@@
-214,7
+220,7
@@
const char miscutil_h_rcs[] = MISCUTIL_H_VERSION;
* Returns : Pointer to newly malloc'd memory chunk.
*
*********************************************************************/
* Returns : Pointer to newly malloc'd memory chunk.
*
*********************************************************************/
-void *zalloc(
in
t size)
+void *zalloc(
size_
t size)
{
void * ret;
{
void * ret;
@@
-497,10
+503,10
@@
char *chomp(char *string)
*********************************************************************/
char *strsav(char *old, const char *text_to_append)
{
*********************************************************************/
char *strsav(char *old, const char *text_to_append)
{
-
in
t old_len, new_len = 0;
+
size_
t old_len, new_len = 0;
char *p;
char *p;
- if ((
text_to_append == NULL) || (*text_to_append == '\0'))
+ if ((text_to_append == NULL) || (*text_to_append == '\0'))
{
return(old);
}
{
return(old);
}
@@
-509,7
+515,7
@@
char *strsav(char *old, const char *text_to_append)
{
if ((p = strdup(text_to_append)) == NULL)
{
{
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;
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
return p;
@@
-791,25
+797,25
@@
int simplematch(char *pattern, char *text)
*
* Parameters :
* 1 : string = string to be duplicated
*
* Parameters :
* 1 : string = string to be duplicated
- * 2 : n = number of bytes to duplicate
+ * 2 :
le
n = number of bytes to duplicate
*
* Returns : pointer to copy, or NULL if failiure
*
*********************************************************************/
*
* Returns : pointer to copy, or NULL if failiure
*
*********************************************************************/
-char *bindup(const char *string,
int
n)
+char *bindup(const char *string,
size_t le
n)
{
{
- char *dup;
+ char *dup
licate
;
- if (NULL == (dup
= (char *)malloc(
n)))
+ if (NULL == (dup
licate = (char *)malloc(le
n)))
{
return NULL;
}
else
{
{
return NULL;
}
else
{
- memcpy(dup
, string,
n);
+ memcpy(dup
licate, string, le
n);
}
}
- return dup;
+ return dup
licate
;
}
}
@@
-890,17
+896,17
@@
char * make_path(const char * dir, const char * file)
#if defined(unix)
if ( *dir != '/' && basedir && *basedir )
{
#if defined(unix)
if ( *dir != '/' && basedir && *basedir )
{
-
path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3);
-
if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
-
strcpy(path, basedir);
-
strcat(path, "/");
-
strcat(path, dir);
+ path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3);
+ if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+ strcpy(path, basedir);
+ strcat(path, "/");
+ strcat(path, dir);
}
else
{
}
else
{
-
path = malloc(strlen(dir) + strlen(file) + 2);
-
if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
-
strcpy(path, dir);
+ path = malloc(strlen(dir) + strlen(file) + 2);
+ if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!");
+ strcpy(path, dir);
}
#else
}
#else
@@
-1013,24
+1019,24
@@
Author
* Small values favor memcpy, large values favor inline code.
*/
#if defined(__alpha__) || defined(__alpha)
* Small values favor memcpy, large values favor inline code.
*/
#if defined(__alpha__) || defined(__alpha)
-# define breakeven_point 2 /* AXP (DEC Alpha) - gcc or cc or egcs */
+# define breakeven_point 2
/* AXP (DEC Alpha) - gcc or cc or egcs */
#endif
#if defined(__i386__) || defined(__i386)
#endif
#if defined(__i386__) || defined(__i386)
-# define breakeven_point 12 /* Intel Pentium/Linux - gcc 2.96 */
+# define breakeven_point 12
/* Intel Pentium/Linux - gcc 2.96 */
#endif
#if defined(__hppa)
#endif
#if defined(__hppa)
-# define breakeven_point 10 /* HP-PA - gcc */
+# define breakeven_point 10
/* HP-PA - gcc */
#endif
#if defined(__sparc__) || defined(__sparc)
#endif
#if defined(__sparc__) || defined(__sparc)
-# define breakeven_point 33 /* Sun Sparc 5 - gcc 2.8.1 */
+# define breakeven_point 33
/* Sun Sparc 5 - gcc 2.8.1 */
#endif
/* some other values of possible interest: */
#endif
/* some other values of possible interest: */
-/* #define breakeven_point 8 */
/* VAX 4000 - vaxc */
-/* #define breakeven_point 19 */
/* VAX 4000 - gcc 2.7.0 */
+/* #define breakeven_point 8 */ /* VAX 4000 - vaxc */
+/* #define breakeven_point 19 */ /* VAX 4000 - gcc 2.7.0 */
#ifndef breakeven_point
#ifndef breakeven_point
-# define breakeven_point 6 /* some reasonable one-size-fits-all value */
+# define breakeven_point 6
/* some reasonable one-size-fits-all value */
#endif
#define fast_memcpy(d,s,n) \
#endif
#define fast_memcpy(d,s,n) \