Sfoglia il codice sorgente

libdpkg: Rename modstatdb_init() to modstatdb_open()

We'll need to reuse the modstatdb_init() function name for further
refactoring.
Guillem Jover 15 anni fa
parent
commit
7a14fd7d66
9 ha cambiato i file con 21 aggiunte e 20 eliminazioni
  1. 1 1
      dselect/main.cc
  2. 1 1
      lib/dpkg/dbmodify.c
  3. 1 1
      lib/dpkg/dpkg-db.h
  4. 1 0
      lib/dpkg/libdpkg.Versions
  5. 1 1
      src/archives.c
  6. 4 4
      src/enquiry.c
  7. 1 1
      src/packages.c
  8. 8 8
      src/querycmd.c
  9. 3 3
      src/select.c

+ 1 - 1
dselect/main.cc

@@ -360,7 +360,7 @@ extern void operator delete(void *p) {
 }
 
 urqresult urq_list(void) {
-  readwrite = modstatdb_init(admindir, (modstatdb_rw)(msdbrw_writeifposs |
+  readwrite = modstatdb_open(admindir, (modstatdb_rw)(msdbrw_writeifposs |
                                                       msdbrw_available_readonly));
 
   curseson();

+ 1 - 1
lib/dpkg/dbmodify.c

@@ -201,7 +201,7 @@ modstatdb_unlock(void)
 }
 
 enum modstatdb_rw
-modstatdb_init(const char *admindir, enum modstatdb_rw readwritereq)
+modstatdb_open(const char *admindir, enum modstatdb_rw readwritereq)
 {
   const struct fni *fnip;
 

+ 1 - 1
lib/dpkg/dpkg-db.h

@@ -225,7 +225,7 @@ enum modstatdb_rw {
 bool modstatdb_is_locked(const char *admindir);
 void modstatdb_lock(const char *admindir);
 void modstatdb_unlock(void);
-enum modstatdb_rw modstatdb_init(const char *admindir, enum modstatdb_rw reqrwflags);
+enum modstatdb_rw modstatdb_open(const char *admindir, enum modstatdb_rw reqrwflags);
 void modstatdb_note(struct pkginfo *pkg);
 void modstatdb_note_ifwrite(struct pkginfo *pkg);
 void modstatdb_checkpoint(void);

+ 1 - 0
lib/dpkg/libdpkg.Versions

@@ -227,6 +227,7 @@ LIBDPKG_PRIVATE {
 	modstatdb_is_locked;
 	modstatdb_lock;
 	modstatdb_unlock;
+	modstatdb_open;
 	modstatdb_note;
 	modstatdb_note_ifwrite;
 	modstatdb_checkpoint;

+ 1 - 1
src/archives.c

@@ -1181,7 +1181,7 @@ void archivefiles(const char *const *argv) {
 
   trigproc_install_hooks();
 
-  modstatdb_init(admindir,
+  modstatdb_open(admindir,
                  f_noact ?                          msdbrw_readonly :
                  (cipaction->arg_int == act_avail ? msdbrw_readonly :
                   fc_nonroot ?                      msdbrw_write :

+ 4 - 4
src/enquiry.c

@@ -134,7 +134,7 @@ void audit(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
 
   for (bsi= badstatinfos; bsi->yesno; bsi++) {
     struct pkgiterator *it;
@@ -204,7 +204,7 @@ void unpackchk(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
 
   totalcount= 0;
   sectionentries = NULL;
@@ -282,7 +282,7 @@ assert_version_support(const char *const *argv,
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
 
   pkg = pkg_db_find("dpkg");
   switch (pkg->status) {
@@ -348,7 +348,7 @@ void predeppackage(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_readonly | msdbrw_available_readonly);
+  modstatdb_open(admindir, msdbrw_readonly | msdbrw_available_readonly);
   /* We use clientdata->istobe to detect loops. */
   clear_istobes();
 

+ 1 - 1
src/packages.c

@@ -122,7 +122,7 @@ packages(const char *const *argv)
 {
   trigproc_install_hooks();
 
-  modstatdb_init(admindir,
+  modstatdb_open(admindir,
                  f_noact ?    msdbrw_readonly :
                  fc_nonroot ? msdbrw_write :
                               msdbrw_needsuperuser);

+ 8 - 8
src/querycmd.c

@@ -202,9 +202,9 @@ listpackages(const char *const *argv)
   struct list_format fmt;
 
   if (!*argv)
-    modstatdb_init(admindir, msdbrw_readonly);
+    modstatdb_open(admindir, msdbrw_readonly);
   else
-    modstatdb_init(admindir, msdbrw_readonly | msdbrw_available_readonly);
+    modstatdb_open(admindir, msdbrw_readonly | msdbrw_available_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -305,7 +305,7 @@ searchfiles(const char *const *argv)
   if (!*argv)
     badusage(_("--search needs at least one file name pattern argument"));
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
   ensure_allinstfiles_available_quiet();
   ensure_diversions();
 
@@ -372,9 +372,9 @@ enqperpackage(const char *const *argv)
     badusage(_("--%s needs at least one package name argument"), cipaction->olong);
 
   if (cipaction->arg_int == act_printavail)
-    modstatdb_init(admindir, msdbrw_readonly | msdbrw_available_readonly);
+    modstatdb_open(admindir, msdbrw_readonly | msdbrw_available_readonly);
   else
-    modstatdb_init(admindir, msdbrw_readonly);
+    modstatdb_open(admindir, msdbrw_readonly);
 
   while ((thisarg = *argv++) != NULL) {
     pkg = pkg_db_find(thisarg);
@@ -470,9 +470,9 @@ showpackages(const char *const *argv)
   }
 
   if (!*argv)
-    modstatdb_init(admindir, msdbrw_readonly);
+    modstatdb_open(admindir, msdbrw_readonly);
   else
-    modstatdb_init(admindir, msdbrw_readonly | msdbrw_available_readonly);
+    modstatdb_open(admindir, msdbrw_readonly | msdbrw_available_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -575,7 +575,7 @@ control_path(const char *const *argv)
         badusage(_("control file contains %c"), *c);
   }
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
 
   pkg = pkg_db_find(pkg_name);
   if (pkg->status == stat_notinstalled)

+ 3 - 3
src/select.c

@@ -50,7 +50,7 @@ void getselections(const char *const *argv) {
   const char *thisarg;
   int i, found;
 
-  modstatdb_init(admindir, msdbrw_readonly);
+  modstatdb_open(admindir, msdbrw_readonly);
 
   pkg_array_init_from_db(&array);
   pkg_array_sort(&array, pkg_sorter_by_name);
@@ -91,7 +91,7 @@ void setselections(const char *const *argv) {
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_write | msdbrw_available_readonly);
+  modstatdb_open(admindir, msdbrw_write | msdbrw_available_readonly);
 
   lno= 1;
   for (;;) {
@@ -154,7 +154,7 @@ void clearselections(const char *const *argv)
   if (*argv)
     badusage(_("--%s takes no arguments"), cipaction->olong);
 
-  modstatdb_init(admindir, msdbrw_write);
+  modstatdb_open(admindir, msdbrw_write);
 
   it = pkg_db_iter_new();
   while ((pkg = pkg_db_iter_next(it))) {