X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=7c5f7dffc6c148501964bfdef42a4d8e83a18ce1;hp=eff5cb3dda118194778d288e16a3c11e92061339;hb=a473a2a85dbf5325b270a906e85785ba4b032503;hpb=e72b401da5537a14b29e945944926373cb251825 diff --git a/miscutil.h b/miscutil.h index eff5cb3d..7c5f7dff 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,23 +1,22 @@ #ifndef MISCUTIL_H_INCLUDED #define MISCUTIL_H_INCLUDED -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.30 2008/04/17 14:53:31 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ * - * Purpose : zalloc, hash_string, safe_strerror, strcmpic, - * strncmpic, and MinGW32 strdup functions. These are - * each too small to deserve their own file but don't - * really fit in any other file. + * Purpose : zalloc, hash_string, strcmpic, strncmpic, and + * MinGW32 strdup functions. These are each too small + * to deserve their own file but don't really fit in + * any other file. * - * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge - * Privoxy team. http://www.privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2011 the + * Privoxy team. https://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,22 +45,25 @@ 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); +extern void write_pid_file(const char *pid_file); #endif /* unix */ extern unsigned int hash_string(const char* s); -extern char *safe_strerror(int err); - extern int strcmpic(const char *s1, const char *s2); 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 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); @@ -69,14 +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 */ - #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) */ @@ -94,9 +88,8 @@ size_t privoxy_strlcat(char *destination, const char *source, size_t size); #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); #if defined(__cplusplus) }