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

dpkg: Use enum dep_check values instead of literal strings

Guillem Jover лет назад: 14
Родитель
Сommit
14e63102e2
2 измененных файлов с 6 добавлено и 5 удалено
  1. 3 3
      src/configure.c
  2. 3 2
      src/remove.c

+ 3 - 3
src/configure.c

@@ -324,7 +324,7 @@ deferred_configure(struct pkginfo *pkg)
 			sincenothing = 0;
 
 	ok = dependencies_ok(pkg, NULL, &aemsgs);
-	if (ok == 1) {
+	if (ok == dep_check_defer) {
 		varbuf_destroy(&aemsgs);
 		pkg->clientdata->istobe = itb_installnew;
 		add_to_queue(pkg);
@@ -341,8 +341,8 @@ deferred_configure(struct pkginfo *pkg)
 	 * processing new packages can't enter into unpacked.
 	 */
 
-	ok = breakses_ok(pkg, &aemsgs) ? ok : 0;
-	if (ok == 0) {
+	ok = breakses_ok(pkg, &aemsgs) ? ok : dep_check_halt;
+	if (ok == dep_check_halt) {
 		sincenothing = 0;
 		varbuf_end_str(&aemsgs);
 		fprintf(stderr,

+ 3 - 2
src/remove.c

@@ -73,8 +73,9 @@ static void checkforremoval(struct pkginfo *pkgtoremove,
     if (dependtry > 1) { if (findbreakcycle(pkgtoremove)) sincenothing= 0; }
     before= raemsgs->used;
     ok= dependencies_ok(depender,pkgtoremove,raemsgs);
-    if (ok == 0 && depender->clientdata->istobe == itb_remove) ok= 1;
-    if (ok == 1)
+    if (ok == dep_check_halt && depender->clientdata->istobe == itb_remove)
+      ok = dep_check_defer;
+    if (ok == dep_check_defer)
       /* Don't burble about reasons for deferral. */
       varbuf_trunc(raemsgs, before);
     if (ok < *rokp) *rokp= ok;