From 3a2bbdb05ca6a6996e424c9fb225cb0d53804125 Mon Sep 17 00:00:00 2001 From: Alberto Gonzalez Iniesta Date: Tue, 27 Dec 2016 18:25:47 +0100 Subject: New upstream version 2.4.0 --- src/openvpn/argv.h | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) (limited to 'src/openvpn/argv.h') diff --git a/src/openvpn/argv.h b/src/openvpn/argv.h index 9aee641..1dd6dd7 100644 --- a/src/openvpn/argv.h +++ b/src/openvpn/argv.h @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. + * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -34,37 +34,43 @@ #include "buffer.h" struct argv { - size_t capacity; - size_t argc; - char **argv; + size_t capacity; + size_t argc; + char **argv; }; -struct argv argv_new (void); -void argv_reset (struct argv *a); -const char *argv_str (const struct argv *a, struct gc_arena *gc, const unsigned int flags); -struct argv argv_insert_head (const struct argv *a, const char *head); -void argv_msg (const int msglev, const struct argv *a); -void argv_msg_prefix (const int msglev, const struct argv *a, const char *prefix); -void argv_parse_cmd (struct argv *a, const char *s); +struct argv argv_new(void); -void argv_printf (struct argv *a, const char *format, ...) +void argv_reset(struct argv *a); + +const char *argv_str(const struct argv *a, struct gc_arena *gc, const unsigned int flags); + +struct argv argv_insert_head(const struct argv *a, const char *head); + +void argv_msg(const int msglev, const struct argv *a); + +void argv_msg_prefix(const int msglev, const struct argv *a, const char *prefix); + +void argv_parse_cmd(struct argv *a, const char *s); + +void argv_printf(struct argv *a, const char *format, ...) #ifdef __GNUC__ #if __USE_MINGW_ANSI_STDIO - __attribute__ ((format (gnu_printf, 2, 3))) +__attribute__ ((format(gnu_printf, 2, 3))) #else - __attribute__ ((format (__printf__, 2, 3))) +__attribute__ ((format(__printf__, 2, 3))) #endif #endif - ; +; -void argv_printf_cat (struct argv *a, const char *format, ...) +void argv_printf_cat(struct argv *a, const char *format, ...) #ifdef __GNUC__ #if __USE_MINGW_ANSI_STDIO - __attribute__ ((format (gnu_printf, 2, 3))) +__attribute__ ((format(gnu_printf, 2, 3))) #else - __attribute__ ((format (__printf__, 2, 3))) +__attribute__ ((format(__printf__, 2, 3))) #endif #endif - ; +; -#endif +#endif /* ifndef ARGV_H */ -- cgit v1.2.3