X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=e65a8a2e9f6de2d80151ab4ed0ac3834424ac1f4;hp=4fbc509215aa3e7e471e1f6bb31bc5c46a49ac99;hb=b2f6c04a498e1ad875a35664c46bf33680171164;hpb=7600ab8fcf587195f51d2faf6e92d1d1a2e24fd0 diff --git a/miscutil.h b/miscutil.h index 4fbc5092..e65a8a2e 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ #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 $" +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.37 2012/11/24 13:58:17 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -14,10 +14,10 @@ * 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 * - * 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 @@ -46,6 +46,9 @@ extern "C" { 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) extern void write_pid_file(void); @@ -58,8 +61,9 @@ 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 char *string_toupper(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); @@ -67,10 +71,6 @@ extern char *make_path(const char * dir, const char * file); 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 */