summaryrefslogtreecommitdiff
path: root/replace.h
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-02-07 14:56:18 -0500
committerJeff Layton <jlayton@redhat.com>2010-02-07 14:56:18 -0500
commit502ba1666b2cf73c479bb041fcd5ad38236b322c (patch)
treeb04038d3563b5c97029aae973b139838e8dac912 /replace.h
parent01cdb73241999039260a92312f3151fbde478ede (diff)
downloadcifs-utils-502ba1666b2cf73c479bb041fcd5ad38236b322c.tar.gz
cifs-utils-502ba1666b2cf73c479bb041fcd5ad38236b322c.tar.bz2
cifs-utils-502ba1666b2cf73c479bb041fcd5ad38236b322c.zip
replace.h: pare down some unneeded replacements
A lot of this stuff is for other platforms, which we don't need to really worry about much with cifs-utils. Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'replace.h')
-rw-r--r--replace.h52
1 files changed, 0 insertions, 52 deletions
diff --git a/replace.h b/replace.h
index 741d8ec..69cf776 100644
--- a/replace.h
+++ b/replace.h
@@ -133,11 +133,6 @@ extern int errno;
char *rep_strdup(const char *s);
#endif
-#ifndef HAVE_MEMMOVE
-#define memmove rep_memmove
-void *rep_memmove(void *dest,const void *src,int size);
-#endif
-
#ifndef HAVE_MEMMEM
#define memmem rep_memmem
void *rep_memmem(const void *haystack, size_t haystacklen,
@@ -164,28 +159,6 @@ void *rep_memmem(const void *haystack, size_t haystacklen,
/* prototype is in "system/time.h" */
#endif
-#ifndef HAVE_STRLCPY
-#define strlcpy rep_strlcpy
-size_t rep_strlcpy(char *d, const char *s, size_t bufsize);
-#endif
-
-#ifndef HAVE_STRLCAT
-#define strlcat rep_strlcat
-size_t rep_strlcat(char *d, const char *s, size_t bufsize);
-#endif
-
-#if (defined(BROKEN_STRNDUP) || !defined(HAVE_STRNDUP))
-#undef HAVE_STRNDUP
-#define strndup rep_strndup
-char *rep_strndup(const char *s, size_t n);
-#endif
-
-#if (defined(BROKEN_STRNLEN) || !defined(HAVE_STRNLEN))
-#undef HAVE_STRNLEN
-#define strnlen rep_strnlen
-size_t rep_strnlen(const char *s, size_t n);
-#endif
-
#if !HAVE_DECL_ENVIRON
#ifdef __APPLE__
#include <crt_externs.h>
@@ -354,33 +327,8 @@ int rep_dlclose(void *handle);
int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
#endif
-#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-#define snprintf rep_snprintf
-int rep_snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
-#endif
-
-#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
-#define vsnprintf rep_vsnprintf
-int rep_vsnprintf(char *,size_t ,const char *, va_list ap) PRINTF_ATTRIBUTE(3,0);
-#endif
-
-#ifndef HAVE_ASPRINTF
-#define asprintf rep_asprintf
-int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
-#endif
-
-#ifndef HAVE_VSYSLOG
-#ifdef HAVE_SYSLOG
-#define vsyslog rep_vsyslog
-void rep_vsyslog (int facility_priority, const char *format, va_list arglist) PRINTF_ATTRIBUTE(2,0);
-#endif
-#endif
-
-/* we used to use these fns, but now we have good replacements
- for snprintf and vsnprintf */
#define slprintf snprintf
-
#ifndef HAVE_VA_COPY
#undef va_copy
#ifdef HAVE___VA_COPY