Selaa lähdekoodia

libdpkg: Use trig_file_activate_byname() instead of ad-hoc code

The trk_file functions were open coding this function, use it instead.
Guillem Jover 14 vuotta sitten
vanhempi
commit
4ce011f68f
1 muutettua tiedostoa jossa 1 lisäystä ja 6 poistoa
  1. 1 6
      lib/dpkg/triglib.c

+ 1 - 6
lib/dpkg/triglib.c

@@ -533,8 +533,6 @@ ok:
 	filetriggers_edited = 0;
 }
 
-static struct filenamenode *filetriggers_activating;
-
 void
 trig_file_activate_byname(const char *trig, struct pkginfo *aw)
 {
@@ -558,15 +556,12 @@ trig_file_activate(struct filenamenode *trig, struct pkginfo *aw)
 static void
 trk_file_activate_start(void)
 {
-	filetriggers_activating = trigh.namenode_find(trig_activating_name, 1);
 }
 
 static void
 trk_file_activate_awaiter(struct pkginfo *aw)
 {
-	if (!filetriggers_activating)
-		return;
-	trig_file_activate(filetriggers_activating, aw);
+	trig_file_activate_byname(trig_activating_name, aw);
 }
 
 static void