Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 31b1e77
Rip out the counter stuff
Matthew Seaman committed 11 years ago
commit 31b1e77d003443a3ba8303b20425e6fe3686e199
parent 284f9dd
4 files changed +0 -59
modified libpkg/pkg.h.in
@@ -1251,7 +1251,6 @@ typedef enum {
	PKG_EVENT_SANDBOX_GET_STRING,

	PKG_EVENT_PROGRESS_START,

	PKG_EVENT_PROGRESS_TICK,
- 
	PKG_EVENT_COUNTER,

	PKG_EVENT_BACKUP,

	PKG_EVENT_RESTORE,

	/* errors */
@@ -1274,13 +1273,6 @@ typedef enum {
	PKG_EVENT_NOT_FOUND,

} pkg_event_t;
- 
typedef enum {
- 
  PKG_EVENT_COUNTER_START,
- 
  PKG_EVENT_COUNTER_MINOR_TICK,
- 
  PKG_EVENT_COUNTER_MAJOR_TICK,
- 
  PKG_EVENT_COUNTER_END,
- 
} pkg_event_counter_t;
- 


struct pkg_event {

	pkg_event_t type;

	union {
@@ -1427,11 +1419,6 @@ struct pkg_event {
			int64_t current;

			int64_t total;

		} e_progress_tick;
- 
		struct {
- 
			const char *what;
- 
			int64_t count;
- 
			pkg_event_counter_t state;
- 
		} e_counter;

	};

};
modified libpkg/pkg_event.c
@@ -38,13 +38,6 @@
static pkg_event_cb _cb = NULL;

static void *_data = NULL;
- 
static const char *counter_states[] = {
- 
	[PKG_EVENT_COUNTER_START]      = "start",
- 
	[PKG_EVENT_COUNTER_MINOR_TICK] = "minor_tick",
- 
	[PKG_EVENT_COUNTER_MAJOR_TICK] = "major_tick",
- 
	[PKG_EVENT_COUNTER_END]        = "end",
- 
};
- 


static char *

sbuf_json_escape(struct sbuf *buf, const char *str)

{
@@ -383,12 +376,6 @@ pipeevent(struct pkg_event *ev)
		  "\"data\": { \"current\": %ld, \"total\" : %ld}}",

		  ev->e_progress_tick.current, ev->e_progress_tick.total);

		break;
- 
	case PKG_EVENT_COUNTER:
- 
		sbuf_printf(msg, "{ \"type\": \"COUNTER\", "
- 
		    "\"what\": %s, \"data\": %ld, \"state\": %s}",
- 
		    ev->e_counter.what, ev->e_counter.count,
- 
		    counter_states[ev->e_counter.state]);
- 
		break;

	case PKG_EVENT_BACKUP:

	case PKG_EVENT_RESTORE:

		break;
@@ -1014,16 +1001,3 @@ pkg_emit_progress_tick(int64_t current, int64_t total)
	pkg_emit_event(&ev);



}
-
- 
void
- 
pkg_emit_counter(const char *what, int64_t count, pkg_event_counter_t state)
- 
{
- 
	struct pkg_event ev;
-
- 
	ev.type = PKG_EVENT_COUNTER;
- 
	ev.e_counter.what  = what;
- 
	ev.e_counter.count = count;
- 
	ev.e_counter.state = state;
-
- 
	pkg_emit_event(&ev);
- 
}
modified libpkg/private/event.h
@@ -70,8 +70,6 @@ int pkg_emit_query_select(const char *msg, const char **items, int ncnt, int def
void pkg_emit_progress_start(const char *fmt, ...);

void pkg_emit_progress_tick(int64_t current, int64_t total);
- 
void pkg_emit_counter(const char *what, int64_t count, pkg_event_counter_t state);
- 


void pkg_emit_add_deps_begin(struct pkg *p);

void pkg_emit_add_deps_finished(struct pkg *p);

void pkg_emit_extract_begin(struct pkg *p);
modified src/event.c
@@ -837,24 +837,6 @@ event_callback(void *data, struct pkg_event *ev)
		progressbar_tick(ev->e_progress_tick.current,

		    ev->e_progress_tick.total);

		break;
- 
	case PKG_EVENT_COUNTER:
- 
		if (!quiet) {
- 
			switch (ev->e_counter.state) {
- 
			case PKG_EVENT_COUNTER_START:
- 
				printf("%-24s:", ev->e_counter.what);
- 
				break;
- 
			case PKG_EVENT_COUNTER_MINOR_TICK:
- 
				printf(".");
- 
				break;
- 
			case PKG_EVENT_COUNTER_MAJOR_TICK:
- 
				printf("[%ld]", ev->e_counter.count);
- 
				break;
- 
			case PKG_EVENT_COUNTER_END:
- 
				printf("<%ld>\n", ev->e_counter.count);
- 
				break;
- 
			}
- 
		}
- 
		break;

	case PKG_EVENT_BACKUP:

		sbuf_cat(msg_buf, "Backing up");

		sbuf_finish(msg_buf);