Commit 453e821a authored Feb 06, 2013 by Yang Tse

vms_show: post VMS patch cleanup - II

- remove multiple declarations of vms_show and add comments

parent e0c49102

src/tool_main.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,16 @@
		*/
		#include "memdebug.h" /* keep this as LAST include */

		#ifdef __VMS
		/*
		* vms_show is a global variable, used in main() as parameter for
		* function vms_special_exit() to allow proper curl tool exiting.
		* Its value may be set in other tool_*.c source files thanks to
		* forward declaration present in tool_vms.h
		*/
		static int vms_show = 0;
		#endif

		/*
		* Ensure that file descriptors 0, 1 and 2 (stdin, stdout, stderr) are
		* open before starting to run. Otherwise, the first three network

src/tool_operate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@
		#include "tool_writeenv.h"
		#include "tool_writeout.h"
		#include "tool_xattr.h"
		#include "tool_vms.h"

		#include "memdebug.h" /* keep this as LAST include */

		@@ -1537,7 +1538,6 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
		show_error:

		#ifdef __VMS
		vms_show = 0;
		if(is_vms_shell()) {
		/* VMS DCL shell behavior */
		if(!config->showerror)

src/tool_setup.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -49,10 +49,6 @@
		# define main(x,y) curl_main(x,y)
		#endif

		#ifdef __VMS
		# include "tool_vms.h"
		#endif

		#ifdef TPF
		# undef select
		/* change which select is used for the curl command line tool */

src/tool_vms.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,12 @@

		#ifdef __VMS

		int vms_show; /* If VMS error code has been written */
		/*
		* Forward-declaration of global variable vms_show defined
		* in tool_main.c, used in main() as parameter for function
		* vms_special_exit() to allow proper curl tool exiting.
		*/
		extern int vms_show;

		int is_vms_shell(void);
		void vms_special_exit(int code, int vms_show);