Pack globals variables used to control apps/verify_callback()

[openssl.git] / apps / apps.h

diff --git a/apps/apps.h b/apps/apps.h
index 5faf440200bd9bd31a8916104311dcb6a59f663b..33a2f683fa549df0a5a96bc7a388585d10bb8c2b 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -367,6 +367,11 @@ typedef struct args_st {
  * can be re-used.
  */
 char **copy_argv(int *argc, char *argv[]);
+/*
+ * Win32-specific argv initialization that splits OS-supplied UNICODE
+ * command line string to array of UTF8-encoded strings.
+ */
+void win32_utf8argv(int *argc, char **argv[]);
 
 
 # define PW_MIN_LENGTH 4
@@ -546,11 +551,14 @@ int raw_write_stdout(const void *, int);
 # define TM_STOP         1
 double app_tminterval(int stop, int usertime);
 
-/* this is an accident waiting to happen (-Wshadow is your friend) */
-extern int verify_depth;
-extern int verify_quiet;
-extern int verify_error;
-extern int verify_return_error;
+typedef struct verify_options_st {
+    int depth;
+    int quiet;
+    int error;
+    int return_error;
+} VERIFY_CB_ARGS;
+
+extern VERIFY_CB_ARGS verify_args;
 
 # include "progs.h"