libdpkg: Rename and namespace option parsing and loading functions

dpkg-deb/main.c

@@ -257,7 +257,7 @@ int main(int argc, const char *const *argv) {
   textdomain(PACKAGE);
 
   dpkg_program_init(BACKEND);
-  myopt(&argv, cmdinfos, printforhelp);
+  dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   if (!cipaction) badusage(_("need an action option"));
 

dpkg-split/main.c

@@ -160,7 +160,7 @@ int main(int argc, const char *const *argv) {
   textdomain(PACKAGE);
 
   dpkg_program_init(SPLITTER);
-  myopt(&argv, cmdinfos, printforhelp);
+  dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   admindir = dpkg_db_set_dir(admindir);
   if (opt_depotdir == NULL)

dselect/main.cc

@@ -516,8 +516,8 @@ main(int, const char *const *argv)
 
   push_error_context_func(dselect_catch_fatal_error, print_fatal_error, 0);
 
-  loadcfgfile(DSELECT, cmdinfos);
-  myopt(&argv, cmdinfos, printforhelp);
+  dpkg_options_load(DSELECT, cmdinfos);
+  dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   admindir = dpkg_db_set_dir(admindir);
 

lib/dpkg/libdpkg.map

@@ -160,8 +160,8 @@ LIBDPKG_PRIVATE {
 	deb_version_parse;
 
 	# Configuration and command line handling
-	loadcfgfile;
-	myopt;
+	dpkg_options_load;
+	dpkg_options_parse;
 	badusage;
 	cipaction;		# XXX variable, do not export
 	setaction;

lib/dpkg/options.c

@@ -63,8 +63,8 @@ config_error(const char *file_name, int line_num, const char *fmt, ...)
   ohshit(_("configuration error: %s:%d: %s"), file_name, line_num, buf);
 }
 
-void
-myfileopt(const char *fn, const struct cmdinfo *cmdinfos)
+static void
+dpkg_options_load_file(const char *fn, const struct cmdinfo *cmdinfos)
 {
   FILE *file;
   int line_num = 0;
@@ -156,7 +156,7 @@ valid_config_filename(const struct dirent *dent)
 }
 
 static void
-load_config_dir(const char *prog, const struct cmdinfo *cmdinfos)
+dpkg_options_load_dir(const char *prog, const struct cmdinfo *cmdinfos)
 {
   char *dirname;
   struct dirent **dlist;
@@ -177,7 +177,7 @@ load_config_dir(const char *prog, const struct cmdinfo *cmdinfos)
     char *filename;
 
     m_asprintf(&filename, "%s/%s", dirname, dlist[i]->d_name);
-    myfileopt(filename, cmdinfos);
+    dpkg_options_load_file(filename, cmdinfos);
 
     free(dlist[i]);
     free(filename);
@@ -188,27 +188,27 @@ load_config_dir(const char *prog, const struct cmdinfo *cmdinfos)
 }
 
 void
-loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos)
+dpkg_options_load(const char *prog, const struct cmdinfo *cmdinfos)
 {
   char *home, *file;
 
-  load_config_dir(prog, cmdinfos);
+  dpkg_options_load_dir(prog, cmdinfos);
 
   m_asprintf(&file, "%s/%s.cfg", CONFIGDIR, prog);
-  myfileopt(file, cmdinfos);
+  dpkg_options_load_file(file, cmdinfos);
   free(file);
 
   home = getenv("HOME");
   if (home != NULL) {
     m_asprintf(&file, "%s/.%s.cfg", home, prog);
-    myfileopt(file, cmdinfos);
+    dpkg_options_load_file(file, cmdinfos);
     free(file);
   }
 }
 
 void
-myopt(const char *const **argvp, const struct cmdinfo *cmdinfos,
-      const char *help_str)
+dpkg_options_parse(const char *const **argvp, const struct cmdinfo *cmdinfos,
+                   const char *help_str)
 {
   const struct cmdinfo *cip;
   const char *p, *value;

lib/dpkg/options.h

@@ -58,10 +58,9 @@ void badusage(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
 
 #define MAX_CONFIG_LINE 1024
 
-void myfileopt(const char *fn, const struct cmdinfo *cmdinfos);
-void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos,
-           const char *help_str);
-void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);
+void dpkg_options_load(const char *prog, const struct cmdinfo *cmdinfos);
+void dpkg_options_parse(const char *const **argvp,
+                        const struct cmdinfo *cmdinfos, const char *help_str);
 
 /**
  * Current cmdinfo action.

src/divertcmd.c

@@ -772,7 +772,7 @@ main(int argc, const char * const *argv)
 	textdomain(PACKAGE);
 
 	dpkg_program_init("dpkg-divert");
-	myopt(&argv, cmdinfos, printforhelp);
+	dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
 

src/main.c

@@ -822,7 +822,7 @@ commandfd(const char *const *argv)
         newargs[i] = m_strdup(newargs[i]);
 
     setaction(NULL, NULL);
-    myopt((const char *const **)&newargs, cmdinfos, printforhelp);
+    dpkg_options_parse((const char *const **)&newargs, cmdinfos, printforhelp);
     if (!cipaction) badusage(_("need an action option"));
 
     ret |= cipaction->action(newargs);
@@ -841,8 +841,8 @@ int main(int argc, const char *const *argv) {
   textdomain(PACKAGE);
 
   dpkg_program_init("dpkg");
-  loadcfgfile(DPKG, cmdinfos);
-  myopt(&argv, cmdinfos, printforhelp);
+  dpkg_options_load(DPKG, cmdinfos);
+  dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   if (!cipaction) badusage(_("need an action option"));
 

src/querycmd.c

@@ -866,7 +866,7 @@ int main(int argc, const char *const *argv) {
   textdomain(PACKAGE);
 
   dpkg_program_init("dpkg-query");
-  myopt(&argv, cmdinfos, printforhelp);
+  dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   admindir = dpkg_db_set_dir(admindir);
 

src/statcmd.c

@@ -351,7 +351,7 @@ main(int argc, const char *const *argv)
 	textdomain(PACKAGE);
 
 	dpkg_program_init("dpkg-statoverride");
-	myopt(&argv, cmdinfos, printforhelp);
+	dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
 

src/trigcmd.c

@@ -215,7 +215,7 @@ main(int argc, const char *const *argv)
 	textdomain(PACKAGE);
 
 	dpkg_program_init("dpkg-trigger");
-	myopt(&argv, cmdinfos, printforhelp);
+	dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);