From 718e3744195351130f4ce7dbe0613f4b3e23df93 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 13 Dec 2002 20:15:29 +0000 Subject: Initial revision --- lib/str.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 lib/str.h (limited to 'lib/str.h') diff --git a/lib/str.h b/lib/str.h new file mode 100644 index 00000000..4098896a --- /dev/null +++ b/lib/str.h @@ -0,0 +1,24 @@ +/* + * $Id: str.h,v 1.1 2002/12/13 20:15:29 paul Exp $ + */ + +#ifndef _ZEBRA_STR_H +#define _ZEBRA_STR_H + +#ifndef HAVE_SNPRINTF +int snprintf(char *, size_t, const char *, ...); +#endif + +#ifndef HAVE_VSNPRINTF +#define vsnprintf(buf, size, format, args) vsprintf(buf, format, args) +#endif + +#ifndef HAVE_STRLCPY +size_t strlcpy(char *, const char *, size_t); +#endif + +#ifndef HAVE_STRLCAT +size_t strlcat(char *, const char *, size_t); +#endif + +#endif -- cgit v1.2.3 From 3cb98dee9067372756964f461eb2c931a1c75138 Mon Sep 17 00:00:00 2001 From: ajs Date: Sat, 2 Apr 2005 16:01:05 +0000 Subject: 2005-04-02 Andrew J. Schorr * configure.ac: Add strnlen to AC_CHECK_FUNCS. * zebra.h: Should include str.h to pick up missing functions. * str.h: Declare strnlen if needed. * str.c: Do not include str.h since zebra.h now includes it. (strnlen) New function. --- lib/str.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/str.h') diff --git a/lib/str.h b/lib/str.h index 4098896a..c0016565 100644 --- a/lib/str.h +++ b/lib/str.h @@ -1,5 +1,5 @@ /* - * $Id: str.h,v 1.1 2002/12/13 20:15:29 paul Exp $ + * $Id: str.h,v 1.2 2005/04/02 16:01:05 ajs Exp $ */ #ifndef _ZEBRA_STR_H @@ -21,4 +21,8 @@ size_t strlcpy(char *, const char *, size_t); size_t strlcat(char *, const char *, size_t); #endif +#ifndef HAVE_STRNLEN +extern size_t strnlen(const char *s, size_t maxlen); +#endif + #endif -- cgit v1.2.3 From 8cc4198f9fabe5f10f5a773de1503d82f33a01fb Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 6 May 2005 21:25:49 +0000 Subject: 2005-05-06 Paul Jakma * (general) extern and static'ification of functions in code and header. Cleanup any definitions with unspecified arguments. Add casts for callback assignments where the callback is defined, typically, as passing void *, but the function being assigned has some other pointer type defined as its argument, as gcc complains about casts from void * to X* via function arguments. Fix some old K&R style function argument definitions. Add noreturn gcc attribute to some functions, as appropriate. Add unused gcc attribute to some functions (eg ones meant to help while debugging) Add guard defines to headers which were missing them. * command.c: (install_node) add const qualifier, still doesnt shut up the warning though, because of the double pointer. (cmp_node) ditto * keychain.c: (key_str2time) Add GET_LONG_RANGE() macro, derived fromn vty.h ones to fix some of the (long) < 0 warnings. * thread.c: (various) use thread_empty (cpu_record_hash_key) should cast to uintptr_t, a stdint.h type * vty.h: Add VTY_GET_IPV4_ADDRESS and VTY_GET_IPV4_PREFIX so they removed from ospfd/ospf_vty.h * zebra.h: Move definition of ZEBRA_PORT to here, to remove dependence of lib on zebra/zserv.h --- lib/str.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/str.h') diff --git a/lib/str.h b/lib/str.h index c0016565..145863d2 100644 --- a/lib/str.h +++ b/lib/str.h @@ -1,12 +1,12 @@ /* - * $Id: str.h,v 1.2 2005/04/02 16:01:05 ajs Exp $ + * $Id: str.h,v 1.3 2005/05/06 21:25:49 paul Exp $ */ #ifndef _ZEBRA_STR_H #define _ZEBRA_STR_H #ifndef HAVE_SNPRINTF -int snprintf(char *, size_t, const char *, ...); +extern int snprintf(char *, size_t, const char *, ...); #endif #ifndef HAVE_VSNPRINTF @@ -14,15 +14,16 @@ int snprintf(char *, size_t, const char *, ...); #endif #ifndef HAVE_STRLCPY -size_t strlcpy(char *, const char *, size_t); +extern size_t strlcpy(char *, const char *, size_t); #endif #ifndef HAVE_STRLCAT -size_t strlcat(char *, const char *, size_t); +extern size_t strlcat(char *, const char *, size_t); #endif #ifndef HAVE_STRNLEN extern size_t strnlen(const char *s, size_t maxlen); #endif -#endif +#endif /* _ZEBRA_STR_H */ + -- cgit v1.2.3 From e6a4feb763749ff0c63558db456e617915fd1386 Mon Sep 17 00:00:00 2001 From: hasso Date: Mon, 19 Sep 2005 09:53:21 +0000 Subject: * configure.ac: Test existance of strndup. * lib/str.[ch]: Add strndup() from glibc. --- lib/str.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/str.h') diff --git a/lib/str.h b/lib/str.h index 145863d2..7b83fe1c 100644 --- a/lib/str.h +++ b/lib/str.h @@ -1,5 +1,5 @@ /* - * $Id: str.h,v 1.3 2005/05/06 21:25:49 paul Exp $ + * $Id: str.h,v 1.4 2005/09/19 09:53:21 hasso Exp $ */ #ifndef _ZEBRA_STR_H @@ -25,5 +25,9 @@ extern size_t strlcat(char *, const char *, size_t); extern size_t strnlen(const char *s, size_t maxlen); #endif +#ifndef HAVE_STRNDUP +extern char * strndup (const char *, size_t); +#endif + #endif /* _ZEBRA_STR_H */ -- cgit v1.2.3