diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 15:23:19 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-03 07:37:07 +0200 |
commit | 86a62ab4345b8567a346587d2ddf575523d0b5f8 (patch) | |
tree | 5f79f4a4c612dac6d01a66b7c187bd7e5c127e12 /lib/util/util.h | |
parent | d01f318179f9c2a0e6730642d21465b6dd69ea9f (diff) | |
download | samba-86a62ab4345b8567a346587d2ddf575523d0b5f8.tar.gz samba-86a62ab4345b8567a346587d2ddf575523d0b5f8.tar.xz samba-86a62ab4345b8567a346587d2ddf575523d0b5f8.zip |
lib/util Use compiler-checked safe string macros in top level code.
This brings the 'safe' macros to the top level code, and removes
duplication of the safe_strcpy() and safe_strcat() functions.
Andrew Bartlett
Diffstat (limited to 'lib/util/util.h')
-rw-r--r-- | lib/util/util.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index 5ed8427498..45f1b9cd79 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -62,6 +62,8 @@ extern const char *panic_action; #include "lib/util/memory.h" +#include "lib/util/string_wrappers.h" + /** * Write backtrace to debug log */ @@ -248,13 +250,13 @@ _PUBLIC_ _PURE_ size_t count_chars(const char *s, char c); Safe string copy into a known length string. maxlength does not include the terminating zero. **/ -_PUBLIC_ char *safe_strcpy(char *dest,const char *src, size_t maxlength); +_PUBLIC_ char *safe_strcpy_fn(char *dest,const char *src, size_t maxlength); /** Safe string cat into a string. maxlength does not include the terminating zero. **/ -_PUBLIC_ char *safe_strcat(char *dest, const char *src, size_t maxlength); +_PUBLIC_ char *safe_strcat_fn(char *dest, const char *src, size_t maxlength); /** Routine to get hex characters and turn them into a 16 byte array. |