38c8375 Move status printing into a function and rename existing end function — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Move status printing into a function and rename existing end function

Bryan Drewery committed 12 years ago

commit 38c83755643f5b1daca3d93ff3e2bf5febfae09e
parent 7587b26

1 file changed +16 -10

modified pkg/event.c

@@ -42,7 +42,7 @@ static char url[MAXPATHLEN+1];

 struct sbuf *messages = NULL;
 static void
 print_and_set_term_title(struct sbuf *msg)
 print_status_end(struct sbuf *msg)
 {
 	sbuf_finish(msg);
 	printf("%s", sbuf_data(msg));

@@ -50,6 +50,14 @@ print_and_set_term_title(struct sbuf *msg)

 	sbuf_delete(msg);
 }
 static void
 print_status_begin(struct sbuf *msg)
 {
 	if (nbactions > 0)
 		sbuf_printf(msg, "[%d/%d] ", nbdone, nbactions);
 }
 int
 event_callback(void *data, struct pkg_event *ev)
 {

@@ -112,13 +120,12 @@ event_callback(void *data, struct pkg_event *ev)

 				break;
 			}
 			if (nbactions > 0)
 				sbuf_printf(msg, "[%d/%d] ", nbdone, nbactions);
 			print_status_begin(msg);
 			pkg = ev->e_install_begin.pkg;
 			pkg_sbuf_printf(msg, "Installing %n-%v...", pkg, pkg);
 			print_and_set_term_title(msg);
 			print_status_end(msg);
 		}
 		break;
 	case PKG_EVENT_INSTALL_FINISHED:

@@ -177,13 +184,12 @@ event_callback(void *data, struct pkg_event *ev)

 				break;
 			}
 			if (nbactions > 0)
 				sbuf_printf(msg, "[%d/%d] ", nbdone, nbactions);
 			print_status_begin(msg);
 			pkg = ev->e_install_begin.pkg;
 			pkg_sbuf_printf(msg, "Deleting %n-%v...", pkg, pkg);
 			print_and_set_term_title(msg);
 			print_status_end(msg);
 		}
 		break;
 	case PKG_EVENT_DEINSTALL_FINISHED:

@@ -206,8 +212,8 @@ event_callback(void *data, struct pkg_event *ev)

 				break;
 			}
 			if (nbactions > 0)
 				sbuf_printf(msg, "[%d/%d] ", nbdone, nbactions);
 			print_status_begin(msg);
 			switch (pkg_version_change(pkg)) {
 			case PKG_DOWNGRADE:
 				pkg_sbuf_printf(msg,

@@ -224,7 +230,7 @@ event_callback(void *data, struct pkg_event *ev)

 						pkg, pkg, pkg);
 				break;
 			}
 			print_and_set_term_title(msg);
 			print_status_end(msg);
 		}
 		break;
 	case PKG_EVENT_UPGRADE_FINISHED: