1 files changed, 93 insertions, 59 deletions
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 13843c8b620c..3275ea1d0f6f 100644
--- a/sntp/libopts/proto.h
+++ b/sntp/libopts/proto.h
@@ -1,112 +1,146 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Fri Apr 29 15:44:06 PDT 2011
+ * Generated Fri Aug  8 16:09:18 PDT 2014
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
 
-#ifndef LOCAL
-#  define LOCAL extern
-#  define REDEF_LOCAL 1
-#else
-#  undef  REDEF_LOCAL
-#endif
+/*
+ *  Extracted from alias.c
+ */
+static tSuccess
+too_many_occurrences(tOptions * opts, tOptDesc * od);
+
 /*
  *  Extracted from autoopts.c
  */
-LOCAL void *
+static void *
 ao_malloc(size_t sz);
 
-LOCAL void *
+static void *
 ao_realloc(void *p, size_t sz);
 
-LOCAL char *
+static char *
 ao_strdup(char const *str);
 
-LOCAL tSuccess
-handle_opt(tOptions* pOpts, tOptState* pOptState);
-
-LOCAL tSuccess
-longOptionFind(tOptions* pOpts, char* pzOptName, tOptState* pOptState);
+static tSuccess
+handle_opt(tOptions * opts, tOptState * o_st);
 
-LOCAL tSuccess
-shortOptionFind(tOptions* pOpts, uint_t optValue, tOptState* pOptState);
+static tSuccess
+next_opt(tOptions * opts, tOptState * o_st);
 
-LOCAL tSuccess
-doImmediateOpts(tOptions* pOpts);
+static tSuccess
+regular_opts(tOptions * opts);
 
-LOCAL tSuccess
-doRegularOpts(tOptions* pOpts);
+/*
+ *  Extracted from check.c
+ */
+static bool
+is_consistent(tOptions * pOpts);
 
 /*
  *  Extracted from configfile.c
  */
-LOCAL void
-internalFileLoad(tOptions* pOpts);
+static void
+intern_file_load(tOptions * opts);
 
-LOCAL char*
-parseAttributes(
-    tOptions*           pOpts,
-    char*               pzText,
-    tOptionLoadMode*    pMode,
-    tOptionValue*       pType );
+static char const *
+parse_attrs(tOptions * opts, char const * txt, tOptionLoadMode * pMode,
+            tOptionValue * pType);
 
-LOCAL tSuccess
-validateOptionsStruct(tOptions* pOpts, char const* pzProgram);
+/*
+ *  Extracted from env.c
+ */
+static void
+doPrognameEnv(tOptions * pOpts, teEnvPresetType type);
+
+static void
+env_presets(tOptions * pOpts, teEnvPresetType type);
 
 /*
- *  Extracted from environment.c
+ *  Extracted from find.c
  */
-LOCAL void
-doPrognameEnv(tOptions* pOpts, teEnvPresetType type);
+static tSuccess
+opt_find_long(tOptions * opts, char const * opt_name, tOptState * state);
+
+static tSuccess
+opt_find_short(tOptions* pOpts, uint_t optValue, tOptState* pOptState);
 
-LOCAL void
-doEnvPresets(tOptions* pOpts, teEnvPresetType type);
+static tSuccess
+get_opt_arg(tOptions * opts, tOptState * o_st);
+
+static tSuccess
+find_opt(tOptions * opts, tOptState * o_st);
+
+/*
+ *  Extracted from init.c
+ */
+static tSuccess
+validate_struct(tOptions * opts, char const * pname);
+
+static tSuccess
+immediate_opts(tOptions * opts);
+
+static bool
+ao_initialize(tOptions * opts, int a_ct, char ** a_v);
 
 /*
  *  Extracted from load.c
  */
-LOCAL void
-mungeString(char* pzTxt, tOptionLoadMode mode);
+static void
+munge_str(char * txt, tOptionLoadMode mode);
+
+static void
+load_opt_line(tOptions * opts, tOptState * opt_state, char * line,
+              tDirection direction, tOptionLoadMode load_mode );
+
+/*
+ *  Extracted from makeshell.c
+ */
+static noreturn void
+option_exits(int exit_code);
+
+static noreturn void
+ao_bug(char const * msg);
+
+static void
+fserr_warn(char const * prog, char const * op, char const * fname);
 
-LOCAL void
-loadOptionLine(
-    tOptions*   pOpts,
-    tOptState*  pOS,
-    char*       pzLine,
-    tDirection  direction,
-    tOptionLoadMode   load_mode );
+static noreturn void
+fserr_exit(char const * prog, char const * op, char const * fname);
 
 /*
  *  Extracted from nested.c
  */
-LOCAL void
-unload_arg_list(tArgList* pAL);
+static void
+unload_arg_list(tArgList * arg_list);
 
-LOCAL tOptionValue*
-optionLoadNested(char const* pzTxt, char const* pzName, size_t nameLen);
+static tOptionValue *
+optionLoadNested(char const * text, char const * name, size_t nm_len);
 
-LOCAL int
+static int
 get_special_char(char const ** ppz, int * ct);
 
-LOCAL void
+static void
 emit_special_char(FILE * fp, int ch);
 
 /*
  *  Extracted from sort.c
  */
-LOCAL void
-optionSort(tOptions* pOpts);
+static void
+optionSort(tOptions * opts);
 
 /*
  *  Extracted from stack.c
  */
-LOCAL void
-addArgListEntry(void** ppAL, void* entry);
+static void
+addArgListEntry(void ** ppAL, void * entry);
+
+/*
+ *  Extracted from usage.c
+ */
+static void
+set_usage_flags(tOptions * opts, char const * flg_txt);
 
-#ifdef REDEF_LOCAL
-#  undef LOCAL
-#  define LOCAL
-#endif
 #endif /* AUTOOPTS_PROTO_H_GUARD */