9053ebe6ee
With some toolchains, compilation of str.c produced the following error:
compiler/str.h:56:50: error: unknown type name ‘va_list’
int str_vaddf(struct str *v, const char *format, va_list ap) ATTR(2,0);
^~~~~~~
One toolchain had the following in its stdarg.h:
"We deliberately do not define va_list when called from
stdio.h, because ANSI C says that stdio.h is not supposed to
define va_list."
str.c includes stdio.h, but none of the prior includes result in the
inclusion of stdarg.h. Therefore, explicitly include it in str.h to fix
the issue on toolchains following this ANSI C rule.
Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com>
61 lines
1.2 KiB
C
61 lines
1.2 KiB
C
/* vim: set sw=8 ts=8 sts=8 noet: */
|
|
/* str.h
|
|
*
|
|
* Copyright (C) 2013 James McKaskill
|
|
*
|
|
* This software may be modified and distributed under the terms
|
|
* of the MIT license. See the LICENSE file for details.
|
|
*/
|
|
|
|
#include <capnp_c.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
|
|
struct str {
|
|
char *str;
|
|
int len, cap;
|
|
};
|
|
|
|
extern char str_static[];
|
|
#define STR_INIT {str_static, 0, 0}
|
|
|
|
void str_reserve(struct str *v, int sz);
|
|
|
|
static inline void str_init(struct str *v, int sz) {
|
|
v->str = str_static;
|
|
v->len = v->cap = 0;
|
|
if (sz)
|
|
str_reserve(v, sz);
|
|
}
|
|
|
|
static inline void str_release(struct str *v) {
|
|
if (v->cap) {
|
|
free(v->str);
|
|
}
|
|
}
|
|
|
|
static inline void str_reset(struct str *v) {
|
|
if (v->len) {
|
|
v->len = 0;
|
|
v->str[0] = '\0';
|
|
}
|
|
}
|
|
|
|
static inline void str_setlen(struct str *v, int sz) {
|
|
str_reserve(v, sz);
|
|
v->str[sz] = '\0';
|
|
v->len = sz;
|
|
}
|
|
|
|
#ifdef __GNUC__
|
|
#define ATTR(FMT, ARGS) __attribute__((format(printf,FMT,ARGS)))
|
|
#else
|
|
#define ATTR(FMT, ARGS)
|
|
#endif
|
|
|
|
void str_add(struct str *v, const char *str, int sz);
|
|
int str_vaddf(struct str *v, const char *format, va_list ap) ATTR(2,0);
|
|
int str_addf(struct str *v, const char *format, ...) ATTR(2,3);
|
|
char *strf(struct str *v, const char *format, ...) ATTR(2,3);
|
|
|
|
|