From: Timo Sirainen Date: Fri, 9 Oct 2009 00:09:20 +0000 (-0400) Subject: compat: Renamed all my_*() fallback functions to i_my_*(). X-Git-Tag: 2.0.alpha1~47 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7d5bfcac5a3edd584258a8dc13b04907156bfb0;p=thirdparty%2Fdovecot%2Fcore.git compat: Renamed all my_*() fallback functions to i_my_*(). This fixes at least my_pread() conflict with libmysqlclient. --HG-- branch : HEAD --- diff --git a/src/lib/compat.c b/src/lib/compat.c index 1f72cd4d98..dbafd23706 100644 --- a/src/lib/compat.c +++ b/src/lib/compat.c @@ -27,7 +27,7 @@ #endif #if !defined (HAVE_STRCASECMP) && !defined (HAVE_STRICMP) -int my_strcasecmp(const char *s1, const char *s2) +int i_my_strcasecmp(const char *s1, const char *s2) { while (*s1 != '\0' && i_toupper(*s1) == i_toupper(*s2)) { s1++; s2++; @@ -36,7 +36,7 @@ int my_strcasecmp(const char *s1, const char *s2) return i_toupper(*s1) - i_toupper(*s2); } -int my_strncasecmp(const char *s1, const char *s2, size_t max_chars) +int i_my_strncasecmp(const char *s1, const char *s2, size_t max_chars) { while (max_chars > 1 && *s1 != '\0' && i_toupper(*s1) == i_toupper(*s2)) { @@ -48,7 +48,7 @@ int my_strncasecmp(const char *s1, const char *s2, size_t max_chars) #endif #ifndef HAVE_INET_ATON -int my_inet_aton(const char *cp, struct in_addr *inp) +int i_my_inet_aton(const char *cp, struct in_addr *inp) { in_addr_t addr; @@ -62,7 +62,7 @@ int my_inet_aton(const char *cp, struct in_addr *inp) #endif #ifndef HAVE_VSYSLOG -void my_vsyslog(int priority, const char *format, va_list args) +void i_my_vsyslog(int priority, const char *format, va_list args) { T_BEGIN { syslog(priority, "%s", t_strdup_vprintf(format, args)); @@ -71,7 +71,7 @@ void my_vsyslog(int priority, const char *format, va_list args) #endif #ifndef HAVE_GETPAGESIZE -int my_getpagesize(void) +int i_my_getpagesize(void) { #ifdef _SC_PAGESIZE return sysconf(_SC_PAGESIZE); @@ -85,7 +85,7 @@ int my_getpagesize(void) #endif #ifndef HAVE_WRITEV -ssize_t my_writev(int fd, const struct iovec *iov, int iov_len) +ssize_t i_my_writev(int fd, const struct iovec *iov, int iov_len) { size_t written; ssize_t ret; @@ -112,7 +112,7 @@ ssize_t my_writev(int fd, const struct iovec *iov, int iov_len) #endif #if !defined(HAVE_PREAD) || defined(PREAD_BROKEN) -ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) +ssize_t i_my_pread(int fd, void *buf, size_t count, off_t offset) { ssize_t ret; off_t old_offset; @@ -133,7 +133,7 @@ ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) return ret; } -ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset) +ssize_t i_my_pwrite(int fd, const void *buf, size_t count, off_t offset) { ssize_t ret; off_t old_offset; @@ -155,19 +155,22 @@ ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset) } #elif defined(PREAD_WRAPPERS) -ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) +ssize_t i_my_pread(int fd, void *buf, size_t count, off_t offset) { - return pread(fd, buf, count, offset); + ssize_t ret; + + ret = pread(fd, buf, count, offset); + return ret; } -ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset) +ssize_t i_my_pwrite(int fd, const void *buf, size_t count, off_t offset) { return pwrite(fd, buf, count, offset); } #endif #ifndef HAVE_SETEUID -int my_seteuid(uid_t euid) +int i_my_seteuid(uid_t euid) { #ifdef HAVE_SETREUID /* HP-UX at least doesn't have seteuid() but has setreuid() */ @@ -179,7 +182,7 @@ int my_seteuid(uid_t euid) #endif #ifndef HAVE_SETEGID -int my_setegid(gid_t egid) +int i_my_setegid(gid_t egid) { #ifdef HAVE_SETRESGID /* HP-UX at least doesn't have setegid() but has setresgid() */ @@ -191,7 +194,7 @@ int my_setegid(gid_t egid) #endif #ifndef HAVE_LIBGEN_H -char *my_basename(char *path) +char *i_my_basename(char *path) { char *p; @@ -203,7 +206,7 @@ char *my_basename(char *path) #endif #ifndef HAVE_STRTOULL -unsigned long long int my_strtoull(const char *nptr, char **endptr, int base) +unsigned long long int i_my_strtoull(const char *nptr, char **endptr, int base) { #ifdef HAVE_STRTOUMAX return strtoumax(nptr, endptr, base); @@ -228,7 +231,7 @@ unsigned long long int my_strtoull(const char *nptr, char **endptr, int base) #endif #ifndef HAVE_STRTOLL -unsigned long long int my_strtoll(const char *nptr, char **endptr, int base) +unsigned long long int i_my_strtoll(const char *nptr, char **endptr, int base) { #ifdef HAVE_STRTOIMAX return strtoimax(nptr, endptr, base); @@ -242,7 +245,7 @@ unsigned long long int my_strtoll(const char *nptr, char **endptr, int base) #ifdef HAVE_OLD_VSNPRINTF #undef vsnprintf -int my_vsnprintf(char *str, size_t size, const char *format, va_list ap) +int i_my_vsnprintf(char *str, size_t size, const char *format, va_list ap) { size_t tmp_size; char *tmp; @@ -290,7 +293,7 @@ int my_vsnprintf(char *str, size_t size, const char *format, va_list ap) #endif #ifndef HAVE_CLOCK_GETTIME -int my_clock_gettime(int clk_id, struct timespec *tp) +int i_my_clock_gettime(int clk_id, struct timespec *tp) { struct timeval tv; diff --git a/src/lib/compat.h b/src/lib/compat.h index 9e6792bdf1..b46bb60fa1 100644 --- a/src/lib/compat.h +++ b/src/lib/compat.h @@ -101,10 +101,10 @@ typedef int socklen_t; # define strcasecmp stricmp # define strncasecmp strnicmp # else -# define strcasecmp my_strcasecmp -# define strncasecmp my_strncasecmp -int my_strcasecmp(const char *s1, const char *s2); -int my_strncasecmp(const char *s1, const char *s2, size_t max_chars); +# define strcasecmp i_my_strcasecmp +# define strncasecmp i_my_strncasecmp +int i_my_strcasecmp(const char *s1, const char *s2); +int i_my_strncasecmp(const char *s1, const char *s2, size_t max_chars); # endif #endif @@ -112,18 +112,18 @@ int my_strncasecmp(const char *s1, const char *s2, size_t max_chars); # include # include # include -# define inet_aton my_inet_aton -int my_inet_aton(const char *cp, struct in_addr *inp); +# define inet_aton i_my_inet_aton +int i_my_inet_aton(const char *cp, struct in_addr *inp); #endif #ifndef HAVE_VSYSLOG -# define vsyslog my_vsyslog -void my_vsyslog(int priority, const char *format, va_list args); +# define vsyslog i_my_vsyslog +void i_my_vsyslog(int priority, const char *format, va_list args); #endif #ifndef HAVE_GETPAGESIZE -# define getpagesize my_getpagesize -int my_getpagesize(void); +# define getpagesize i_my_getpagesize +int i_my_getpagesize(void); #endif #ifndef HAVE_FDATASYNC @@ -155,56 +155,56 @@ struct iovec { #endif #ifndef HAVE_WRITEV -# define writev my_writev +# define writev i_my_writev struct iovec; -ssize_t my_writev(int fd, const struct iovec *iov, int iov_len); +ssize_t i_my_writev(int fd, const struct iovec *iov, int iov_len); #endif #if !defined(HAVE_PREAD) || defined(PREAD_WRAPPERS) || defined(PREAD_BROKEN) # ifndef IN_COMPAT_C -# define pread my_pread -# define pwrite my_pwrite +# define pread i_my_pread +# define pwrite i_my_pwrite # endif -ssize_t my_pread(int fd, void *buf, size_t count, off_t offset); -ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset); +ssize_t i_my_pread(int fd, void *buf, size_t count, off_t offset); +ssize_t i_my_pwrite(int fd, const void *buf, size_t count, off_t offset); #endif #ifndef HAVE_SETEUID -# define seteuid my_seteuid -int my_seteuid(uid_t euid); +# define seteuid i_my_seteuid +int i_my_seteuid(uid_t euid); #endif #ifndef HAVE_SETEGID -# define setegid my_setegid -int my_setegid(gid_t egid); +# define setegid i_my_setegid +int i_my_setegid(gid_t egid); #endif #ifndef HAVE_LIBGEN_H -# define basename my_basename -char *my_basename(char *path); +# define basename i_my_basename +char *i_my_basename(char *path); #endif #ifndef HAVE_STRTOULL -# define strtoull my_strtoull -unsigned long long int my_strtoull(const char *nptr, char **endptr, int base); +# define strtoull i_my_strtoull +unsigned long long int i_my_strtoull(const char *nptr, char **endptr, int base); #endif #ifndef HAVE_STRTOLL -# define strtoll my_strtoll -unsigned long long int my_strtoll(const char *nptr, char **endptr, int base); +# define strtoll i_my_strtoll +unsigned long long int i_my_strtoll(const char *nptr, char **endptr, int base); #endif #ifdef HAVE_OLD_VSNPRINTF # include -# define vsnprintf my_vsnprintf -int my_vsnprintf(char *str, size_t size, const char *format, va_list ap); +# define vsnprintf i_my_vsnprintf +int i_my_vsnprintf(char *str, size_t size, const char *format, va_list ap); #endif #ifndef HAVE_CLOCK_GETTIME # include # undef CLOCK_REALTIME # define CLOCK_REALTIME 1 -# define clock_gettime my_clock_gettime -int my_clock_gettime(int clk_id, struct timespec *tp); +# define clock_gettime i_my_clock_gettime +int i_my_clock_gettime(int clk_id, struct timespec *tp); #endif /* ctype.h isn't safe with signed chars,