Просмотр исходного кода

dpkg: Rename push_conflictor() to enqueue_conflictor()

Guillem Jover лет назад: 14
Родитель
Сommit
7267b0e3c2
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      src/archives.c
  2. 1 1
      src/archives.h
  3. 1 1
      src/processarc.c

+ 1 - 1
src/archives.c

@@ -1189,7 +1189,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
       }
       if (!pdep) {
         /* This conflict is OK - we'll remove the conflictor. */
-        push_conflictor(pkg, fixbyrm);
+        enqueue_conflictor(pkg, fixbyrm);
         varbuf_destroy(&conflictwhy); varbuf_destroy(&removalwhy);
         fprintf(stderr, _("dpkg: yes, will remove %s in favour of %s.\n"),
                 pkg_name(fixbyrm, pnaw_nonambig),

+ 1 - 1
src/archives.h

@@ -43,7 +43,7 @@ extern struct varbuf fnametmpvb;
 extern struct varbuf fnamenewvb;
 extern struct pkg_deconf_list *deconfigure;
 
-void push_conflictor(struct pkginfo *pkg, struct pkginfo *pkg_fixbyrm);
+void enqueue_conflictor(struct pkginfo *pkg, struct pkginfo *pkg_fixbyrm);
 
 void cu_pathname(int argc, void **argv);
 void cu_cidir(int argc, void **argv);

+ 1 - 1
src/processarc.c

@@ -200,7 +200,7 @@ static struct pkginfo *conflictor[MAXCONFLICTORS];
 static int cflict_index = 0;
 
 void
-push_conflictor(struct pkginfo *pkg, struct pkginfo *pkg_fixbyrm)
+enqueue_conflictor(struct pkginfo *pkg, struct pkginfo *pkg_fixbyrm)
 {
   if (cflict_index >= MAXCONFLICTORS)
     ohshit(_("package %s has too many Conflicts/Replaces pairs"),