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

dpkg: Remove scriptname argument from do_script()

Guillem Jover лет назад: 16
Родитель
Сommit
f096d6220a
1 измененных файлов с 5 добавлено и 8 удалено
  1. 5 8
      src/help.c

+ 5 - 8
src/help.c

@@ -269,7 +269,7 @@ static void setexecute(const char *path, struct stat *stab) {
 
 static int
 do_script(struct pkginfo *pkg, struct pkginfoperfile *pif,
-          const char *scriptname, const char *scriptpath, struct stat *stab,
+          const char *scriptpath, struct stat *stab,
           char *const arglist[], const char *name, int warn)
 {
   const char *scriptexec;
@@ -324,8 +324,7 @@ vmaintainer_script_installed(struct pkginfo *pkg, const char *scriptname,
     }
     ohshite(_("unable to stat %s `%.250s'"), buf, scriptpath);
   }
-  do_script(pkg, &pkg->installed, scriptname, scriptpath, &stab,
-            arglist, buf, 0);
+  do_script(pkg, &pkg->installed, scriptpath, &stab, arglist, buf, 0);
 
   return 1;
 }
@@ -385,8 +384,7 @@ maintainer_script_new(struct pkginfo *pkg,
     }
     ohshite(_("unable to stat %s `%.250s'"), buf, cidir);
   }
-  do_script(pkg, &pkg->available, scriptname, cidir, &stab,
-            arglist, buf, 0);
+  do_script(pkg, &pkg->available, cidir, &stab, arglist, buf, 0);
   post_script_tasks();
 
   return 1;
@@ -416,7 +414,7 @@ int maintainer_script_alternative(struct pkginfo *pkg,
     warning(_("unable to stat %s '%.250s': %s"),
             buf,oldscriptpath,strerror(errno));
   } else {
-    if (!do_script(pkg, &pkg->installed, scriptname, oldscriptpath, &stab,
+    if (!do_script(pkg, &pkg->installed, oldscriptpath, &stab,
                    arglist, buf, PROCWARN)) {
       post_script_tasks();
       return 1;
@@ -438,8 +436,7 @@ int maintainer_script_alternative(struct pkginfo *pkg,
       ohshite(_("unable to stat %s `%.250s'"),buf,cidir);
   }
 
-  do_script(pkg, &pkg->available, scriptname, cidir, &stab,
-            arglist, buf, 0);
+  do_script(pkg, &pkg->available, cidir, &stab, arglist, buf, 0);
   fprintf(stderr, _("dpkg: ... it looks like that went OK.\n"));
 
   post_script_tasks();