176202f Print debug output only when the -d flag was used. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Print debug output only when the -d flag was used.

jlaffaye committed 14 years ago

commit 176202ffc9bb966175de18460461105d37a8f8b4
parent 4f9c89c

2 files changed +7 -3

modified pkg/event.c

@@ -4,12 +4,13 @@

 #include "event.h"
 int
 event_callback(void *data __unused, struct pkg_event *ev)
 event_callback(void *data, struct pkg_event *ev)
 {
 	struct pkg *pkg = NULL;
 	struct pkg_dep *dep = NULL;
 	unsigned int percent;
 	const char *message;
 	int *debug = data;
 	switch(ev->type) {
 	case PKG_EVENT_ERRNO:

@@ -71,6 +72,9 @@ event_callback(void *data __unused, struct pkg_event *ev)

 	default:
 		break;
 	}
 	printf("at %s:%d\n", ev->file, ev->line);
 	if (*debug > 0)
 		printf("  at %s:%d\n", ev->file, ev->line);
 	return 0;
 }

modified pkg/main.c

@@ -133,7 +133,7 @@ main(int argc, char **argv)

 	if (argc < 2)
 		usage();
 	pkg_event_register(&event_callback, NULL);
 	pkg_event_register(&event_callback, &debug);
 	while ((ch = getopt(argc, argv, "dj:c:")) != -1) {
 		switch(ch) {