From 49b79b76316248d5233d08006234933913faaa3b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 5 Oct 2011 00:03:20 +0200 Subject: curl tool: code moved to tool_*.[ch] files --- src/tool_getparam.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/tool_getparam.h (limited to 'src/tool_getparam.h') diff --git a/src/tool_getparam.h b/src/tool_getparam.h new file mode 100644 index 000000000..c402fd77b --- /dev/null +++ b/src/tool_getparam.h @@ -0,0 +1,46 @@ +#ifndef HEADER_CURL_TOOL_GETPARAM_H +#define HEADER_CURL_TOOL_GETPARAM_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "setup.h" + +typedef enum { + PARAM_OK, + PARAM_OPTION_AMBIGUOUS, + PARAM_OPTION_UNKNOWN, + PARAM_REQUIRES_PARAMETER, + PARAM_BAD_USE, + PARAM_HELP_REQUESTED, + PARAM_GOT_EXTRA_PARAMETER, + PARAM_BAD_NUMERIC, + PARAM_LIBCURL_DOESNT_SUPPORT, + PARAM_NO_MEM, + PARAM_LAST +} ParameterError; + +ParameterError getparameter(char *flag, + char *nextarg, + bool *usedarg, + struct Configurable *config); + +#endif /* HEADER_CURL_TOOL_GETPARAM_H */ + -- cgit v1.2.1 From 919c97fa65a5c00f7044e849eeb0095408413505 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Fri, 6 Apr 2012 23:35:15 +0200 Subject: curl tool: use configuration files from lib directory Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists. --- src/tool_getparam.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tool_getparam.h') diff --git a/src/tool_getparam.h b/src/tool_getparam.h index c402fd77b..0cd2c3972 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ * KIND, either express or implied. * ***************************************************************************/ -#include "setup.h" +#include "tool_setup.h" typedef enum { PARAM_OK, -- cgit v1.2.1 From dd576194ceaf6d9fef625332395a51fca0fca657 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 8 Jun 2012 23:14:30 +0200 Subject: tool_getparam.h: fix compiler error forward declare the Configurable struct --- src/tool_getparam.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/tool_getparam.h') diff --git a/src/tool_getparam.h b/src/tool_getparam.h index 0cd2c3972..7dc49393b 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -37,6 +37,8 @@ typedef enum { PARAM_LAST } ParameterError; +struct Configurable; + ParameterError getparameter(char *flag, char *nextarg, bool *usedarg, -- cgit v1.2.1 From f2b6ebed7bfcfcbe65bcadbce1c5ae7e6134c11e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 10 Jul 2012 23:11:30 +0200 Subject: cmdline: parse numerical options stricter 1 - str2offset() no longer accepts negative numbers since offsets are by nature positive. 2 - introduced str2unum() for the command line parser that accepts numericals which are not supposed to be negative, so that it will properly complain on apparent bad uses and mistakes. Bug: http://curl.haxx.se/mail/archive-2012-07/0013.html --- src/tool_getparam.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tool_getparam.h') diff --git a/src/tool_getparam.h b/src/tool_getparam.h index 7dc49393b..49cc684c9 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -32,6 +32,7 @@ typedef enum { PARAM_HELP_REQUESTED, PARAM_GOT_EXTRA_PARAMETER, PARAM_BAD_NUMERIC, + PARAM_NEGATIVE_NUMERIC, PARAM_LIBCURL_DOESNT_SUPPORT, PARAM_NO_MEM, PARAM_LAST -- cgit v1.2.1 From 79954a1b07c6fc8ed4cf9d48c6383521b184c818 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 26 Nov 2012 16:23:02 +0100 Subject: avoid mixing of enumerated type with another type --- src/tool_getparam.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tool_getparam.h') diff --git a/src/tool_getparam.h b/src/tool_getparam.h index 49cc684c9..38f0674f4 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -24,7 +24,7 @@ #include "tool_setup.h" typedef enum { - PARAM_OK, + PARAM_OK = 0, PARAM_OPTION_AMBIGUOUS, PARAM_OPTION_UNKNOWN, PARAM_REQUIRES_PARAMETER, -- cgit v1.2.1