dovecot-2.0: compat: Renamed all my_*() fallback functions to i_...
dovecot at dovecot.org
dovecot at dovecot.org
Fri Oct 9 03:11:00 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/910059d94bbc
changeset: 10005:910059d94bbc
user: Timo Sirainen <tss at iki.fi>
date: Thu Oct 08 20:09:20 2009 -0400
description:
compat: Renamed all my_*() fallback functions to i_my_*().
This fixes at least my_pread() conflict with libmysqlclient.
diffstat:
2 files changed, 55 insertions(+), 52 deletions(-)
src/lib/compat.c | 45 ++++++++++++++++++++-------------------
src/lib/compat.h | 62 +++++++++++++++++++++++++++---------------------------
diffs (280 lines):
diff -r 4c532d8222f3 -r 910059d94bbc src/lib/compat.c
--- a/src/lib/compat.c Thu Oct 08 18:43:17 2009 -0400
+++ b/src/lib/compat.c Thu Oct 08 20:09:20 2009 -0400
@@ -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
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
#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
#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
#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 i
#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
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 *bu
}
#elif defined(PREAD_WRAPPERS)
-ssize_t my_pread(int fd, void *buf, size_t count, off_t offset)
-{
- return pread(fd, buf, count, 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 ret;
+
+ ret = pread(fd, buf, count, offset);
+ return ret;
+}
+
+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
#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
#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,
#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 -r 4c532d8222f3 -r 910059d94bbc src/lib/compat.h
--- a/src/lib/compat.h Thu Oct 08 18:43:17 2009 -0400
+++ b/src/lib/compat.h Thu Oct 08 20:09:20 2009 -0400
@@ -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
# include <sys/socket.h>
# include <netinet/in.h>
# include <arpa/inet.h>
-# 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
-# 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);
+# define pread i_my_pread
+# define pwrite i_my_pwrite
+# endif
+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 <stdio.h>
-# 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 <time.h>
# 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,
More information about the dovecot-cvs
mailing list