projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl_send_certificate_error(): Remove a 'dead nested assignment'
[privoxy.git]
/
miscutil.h
diff --git
a/miscutil.h
b/miscutil.h
index
4fbc509
..
8f7c137
100644
(file)
--- a/
miscutil.h
+++ b/
miscutil.h
@@
-1,6
+1,5
@@
#ifndef MISCUTIL_H_INCLUDED
#define MISCUTIL_H_INCLUDED
#ifndef MISCUTIL_H_INCLUDED
#define MISCUTIL_H_INCLUDED
-#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.31 2009/05/16 13:27:20 fabiankeil Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $
@@
-11,13
+10,13
@@
* any other file.
*
* Copyright : Written by and Copyright (C) 2001-2011 the
* any other file.
*
* Copyright : Written by and Copyright (C) 2001-2011 the
- * Privoxy team. http://www.privoxy.org/
+ * Privoxy team. http
s
://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
*
* 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
*
* Junkbusters Corporation. http://www.junkbusters.com
*
- * 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
@@
-46,9
+45,12
@@
extern "C" {
extern const char *basedir;
extern void *zalloc(size_t size);
extern const char *basedir;
extern void *zalloc(size_t size);
+extern void *zalloc_or_die(size_t size);
+extern char *strdup_or_die(const char *str);
+extern void *malloc_or_die(size_t buffer_size);
#if defined(unix)
#if defined(unix)
-extern void write_pid_file(
void
);
+extern void write_pid_file(
const char *pid_file
);
#endif /* unix */
extern unsigned int hash_string(const char* s);
#endif /* unix */
extern unsigned int hash_string(const char* s);
@@
-58,8
+60,10
@@
extern int strncmpic(const char *s1, const char *s2, size_t n);
extern jb_err string_append(char **target_string, const char *text_to_append);
extern jb_err string_join (char **target_string, char *text_to_append);
extern jb_err string_append(char **target_string, const char *text_to_append);
extern jb_err string_join (char **target_string, char *text_to_append);
-
extern char *string_toupper(const char *string);
extern char *string_toupper(const char *string);
+extern char *string_tolower(const char *string);
+extern void string_move(char *dst, char *src);
+
extern char *chomp(char *string);
extern char *bindup(const char *string, size_t len);
extern char *chomp(char *string);
extern char *bindup(const char *string, size_t len);
@@
-67,14
+71,6
@@
extern char *make_path(const char * dir, const char * file);
long int pick_from_range(long int range);
long int pick_from_range(long int range);
-#ifdef __MINGW32__
-extern char *strdup(const char *s);
-#endif /* def __MINGW32__ */
-
-#ifndef HAVE_SNPRINTF
-extern int snprintf(char *, size_t, const char *, /*args*/ ...);
-#endif /* ndef HAVE_SNPRINTF */
-
#if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV)
time_t timegm(struct tm *tm);
#endif /* !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) */
#if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV)
time_t timegm(struct tm *tm);
#endif /* !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) */
@@
-92,9
+88,10
@@
size_t privoxy_strlcat(char *destination, const char *source, size_t size);
#define strlcat privoxy_strlcat
#endif /* ndef HAVE_STRLCAT */
#define strlcat privoxy_strlcat
#endif /* ndef HAVE_STRLCAT */
-/* Revision control strings from this header and associated .c file */
-extern const char miscutil_rcs[];
-extern const char miscutil_h_rcs[];
+extern int privoxy_millisleep(unsigned milliseconds);
+extern struct tm *privoxy_gmtime_r(const time_t *time_spec, struct tm *result);
+
+extern int host_is_ip_address(const char *host);
#if defined(__cplusplus)
}
#if defined(__cplusplus)
}