git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inline the smaller string-handling functions
[exim.git]
/
src
/
src
/
mytypes.h
diff --git
a/src/src/mytypes.h
b/src/src/mytypes.h
index d9912c4fffd9c3b684e3e67556c71d49fb620966..5871bddfc6d5f45eba741d8bd322abc9c57f955b 100644
(file)
--- a/
src/src/mytypes.h
+++ b/
src/src/mytypes.h
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/mytypes.h,v 1.5 2008/09/29 11:41:07 nm4 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
07
*/
+/* Copyright (c) University of Cambridge 1995 - 20
18
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-15,19
+13,36
@@
local_scan.h includes it and exim.h includes them both (to get this earlier). */
#ifndef MYTYPES_H
#define MYTYPES_H
#ifndef MYTYPES_H
#define MYTYPES_H
+#ifndef FALSE
+# define FALSE 0
+#endif
-#define FALSE 0
-#define TRUE 1
-#define TRUE_UNSET 2
+#ifndef TRUE
+# define TRUE 1
+#endif
+
+#ifndef TRUE_UNSET
+# define TRUE_UNSET 2
+#endif
/* If gcc is being used to compile Exim, we can use its facility for checking
the arguments of printf-like functions. This is done by a macro. */
/* If gcc is being used to compile Exim, we can use its facility for checking
the arguments of printf-like functions. This is done by a macro. */
-#ifdef __GNUC__
-#define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B)))
+#if defined(__GNUC__) || defined(__clang__)
+# define PRINTF_FUNCTION(A,B) __attribute__((format(printf,A,B)))
+# define ARG_UNUSED __attribute__((__unused__))
+# define WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
#else
#else
-#define PRINTF_FUNCTION(A,B)
+# define PRINTF_FUNCTION(A,B)
+# define ARG_UNUSED /**/
+# define WARN_UNUSED_RESULT /**/
+#endif
+
+#ifdef WANT_DEEPER_PRINTF_CHECKS
+# define ALMOST_PRINTF(A, B) PRINTF_FUNCTION(A, B)
+#else
+# define ALMOST_PRINTF(A, B)
#endif
#endif
@@
-35,8
+50,10
@@
the arguments of printf-like functions. This is done by a macro. */
the standard header files, so we use "uschar". Solaris has u_char in
sys/types.h. This is just a typing convenience, of course. */
the standard header files, so we use "uschar". Solaris has u_char in
sys/types.h. This is just a typing convenience, of course. */
-typedef int BOOL;
typedef unsigned char uschar;
typedef unsigned char uschar;
+typedef unsigned BOOL;
+/* We also have SIGNAL_BOOL, which requires signal.h be included, so is defined
+elsewhere */
/* These macros save typing for the casting that is needed to cope with the
/* These macros save typing for the casting that is needed to cope with the
@@
-51,6
+68,7
@@
almost always literal strings. */
#define US (unsigned char *)
#define CUS (const unsigned char *)
#define USS (unsigned char **)
#define US (unsigned char *)
#define CUS (const unsigned char *)
#define USS (unsigned char **)
+#define CUSS (const unsigned char **)
/* The C library string functions expect "char *" arguments. Use macros to
avoid having to write a cast each time. We do this for string and file
/* The C library string functions expect "char *" arguments. Use macros to
avoid having to write a cast each time. We do this for string and file
@@
-61,7
+79,6
@@
functions that are called quite often; for other calls to external libraries
#define Uatol(s) atol(CCS(s))
#define Uchdir(s) chdir(CCS(s))
#define Uchmod(s,n) chmod(CCS(s),n)
#define Uatol(s) atol(CCS(s))
#define Uchdir(s) chdir(CCS(s))
#define Uchmod(s,n) chmod(CCS(s),n)
-#define Uchown(s,n,m) chown(CCS(s),n,m)
#define Ufgets(b,n,f) fgets(CS(b),n,f)
#define Ufopen(s,t) fopen(CCS(s),CCS(t))
#define Ulink(s,t) link(CCS(s),CCS(t))
#define Ufgets(b,n,f) fgets(CS(b),n,f)
#define Ufopen(s,t) fopen(CCS(s),CCS(t))
#define Ulink(s,t) link(CCS(s),CCS(t))
@@
-97,6
+114,7
@@
functions that are called quite often; for other calls to external libraries
#define Ustrtol(s,t,b) strtol(CCS(s),CSS(t),b)
#define Ustrtoul(s,t,b) strtoul(CCS(s),CSS(t),b)
#define Uunlink(s) unlink(CCS(s))
#define Ustrtol(s,t,b) strtol(CCS(s),CSS(t),b)
#define Ustrtoul(s,t,b) strtoul(CCS(s),CSS(t),b)
#define Uunlink(s) unlink(CCS(s))
+
#endif
/* End of mytypes.h */
#endif
/* End of mytypes.h */