5463b3a Make the public pkg.h c++ friendly — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Make the public pkg.h c++ friendly

Baptiste Daroussin committed 11 years ago

commit 5463b3ad34b4de67ae5452dad67a495dac29f3c3
parent 0b6ebf9

3 files changed +25 -17

modified libpkg/pkg.h.in

@@ -32,6 +32,11 @@

 #ifndef _PKG_H
 #define _PKG_H
 #ifdef __cplusplus
 extern "C" {
 #define restrict
 #endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/cdefs.h>

@@ -1318,12 +1323,12 @@ struct pkg_event {

 			struct pkg *pkg;
 		} e_deinstall_finished;
 		struct {
 			struct pkg *new;
 			struct pkg *old;
 			struct pkg *n;
 			struct pkg *o;
 		} e_upgrade_begin;
 		struct {
 			struct pkg *new;
 			struct pkg *old;
 			struct pkg *n;
 			struct pkg *o;
 		} e_upgrade_finished;
 		struct {
 			struct pkg *pkg;

@@ -1662,4 +1667,7 @@ int pkg_add_port(struct pkgdb *db, struct pkg *pkg, const char *root, \

     const char *locationn, bool testing);
 char *pkg_absolutepath(const char *src, char *dest, size_t dest_len);
 #ifdef __cplusplus
 }
 #endif
 #endif

modified libpkg/pkg_event.c

@@ -217,9 +217,9 @@ pipeevent(struct pkg_event *ev)

 		    "\"pkgversion\": \"%v\" ,"
 		    "\"pkgnewversion\": \"%v\""
 		    "}}",
 		    ev->e_upgrade_begin.old,
 		    ev->e_upgrade_begin.old,
 		    ev->e_upgrade_begin.new);
 		    ev->e_upgrade_begin.o,
 		    ev->e_upgrade_begin.o,
 		    ev->e_upgrade_begin.n);
 		break;
 	case PKG_EVENT_UPGRADE_FINISHED:
 		pkg_sbuf_printf(msg, "{ \"type\": \"INFO_UPGRADE_FINISHED\", "

@@ -228,9 +228,9 @@ pipeevent(struct pkg_event *ev)

 		    "\"pkgversion\": \"%v\" ,"
 		    "\"pkgnewversion\": \"%v\""
 		    "}}",
 		    ev->e_upgrade_finished.old,
 		    ev->e_upgrade_finished.old,
 		    ev->e_upgrade_finished.new);
 		    ev->e_upgrade_finished.o,
 		    ev->e_upgrade_finished.o,
 		    ev->e_upgrade_finished.n);
 		break;
 	case PKG_EVENT_LOCKED:
 		pkg_sbuf_printf(msg, "{ \"type\": \"ERROR_LOCKED\", "

@@ -687,8 +687,8 @@ pkg_emit_upgrade_begin(struct pkg *new, struct pkg *old)

 	struct pkg_event ev;
 	ev.type = PKG_EVENT_UPGRADE_BEGIN;
 	ev.e_upgrade_begin.new = new;
 	ev.e_upgrade_begin.old = old;
 	ev.e_upgrade_begin.n = new;
 	ev.e_upgrade_begin.o = old;
 	pkg_emit_event(&ev);
 }

@@ -700,8 +700,8 @@ pkg_emit_upgrade_finished(struct pkg *new, struct pkg *old)

 	bool syslog_enabled = false;
 	ev.type = PKG_EVENT_UPGRADE_FINISHED;
 	ev.e_upgrade_finished.new = new;
 	ev.e_upgrade_finished.old = old;
 	ev.e_upgrade_finished.n = new;
 	ev.e_upgrade_finished.o = old;
 	syslog_enabled = pkg_object_bool(pkg_config_get("SYSLOG"));
 	if (syslog_enabled) {

modified src/event.c

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

 	case PKG_EVENT_UPGRADE_BEGIN:
 		if (quiet)
 			break;
 		pkg_new = ev->e_upgrade_begin.new;
 		pkg_old = ev->e_upgrade_begin.old;
 		pkg_new = ev->e_upgrade_begin.n;
 		pkg_old = ev->e_upgrade_begin.o;
 		nbdone++;
 		job_status_begin(msg_buf);

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

 	case PKG_EVENT_UPGRADE_FINISHED:
 		if (quiet)
 			break;
 		pkg_new = ev->e_upgrade_finished.new;
 		pkg_new = ev->e_upgrade_finished.n;
 		if (pkg_has_message(pkg_new)) {
 			if (messages == NULL)
 				messages = sbuf_new_auto();