You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2015/01/16 01:17:35 UTC

[2/4] qpid-proton git commit: use PN_CLASSDEF for collector

use PN_CLASSDEF for collector


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1c943bb9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1c943bb9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1c943bb9

Branch: refs/heads/master
Commit: 1c943bb943cb9a29e22b6cb79c00c05f1c4a2804
Parents: a2f6b9f
Author: Rafael Schloming <rh...@alum.mit.edu>
Authored: Thu Jan 15 06:15:37 2015 -0500
Committer: Rafael Schloming <rh...@alum.mit.edu>
Committed: Thu Jan 15 06:15:37 2015 -0500

----------------------------------------------------------------------
 proton-c/src/events/event.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1c943bb9/proton-c/src/events/event.c
----------------------------------------------------------------------
diff --git a/proton-c/src/events/event.c b/proton-c/src/events/event.c
index 55f5f1f..a165199 100644
--- a/proton-c/src/events/event.c
+++ b/proton-c/src/events/event.c
@@ -16,9 +16,8 @@ struct pn_event_t {
   pn_event_type_t type;
 };
 
-static void pn_collector_initialize(void *obj)
+static void pn_collector_initialize(pn_collector_t *collector)
 {
-  pn_collector_t *collector = (pn_collector_t *) obj;
   collector->head = NULL;
   collector->tail = NULL;
   collector->free_head = NULL;
@@ -47,17 +46,15 @@ static void pn_collector_shrink(pn_collector_t *collector)
   collector->free_head = NULL;
 }
 
-static void pn_collector_finalize(void *obj)
+static void pn_collector_finalize(pn_collector_t *collector)
 {
-  pn_collector_t *collector = (pn_collector_t *) obj;
   pn_collector_drain(collector);
   pn_collector_shrink(collector);
 }
 
-static int pn_collector_inspect(void *obj, pn_string_t *dst)
+static int pn_collector_inspect(pn_collector_t *collector, pn_string_t *dst)
 {
-  assert(obj);
-  pn_collector_t *collector = (pn_collector_t *) obj;
+  assert(collector);
   int err = pn_string_addf(dst, "EVENTS[");
   if (err) return err;
   pn_event_t *event = collector->head;
@@ -79,11 +76,11 @@ static int pn_collector_inspect(void *obj, pn_string_t *dst)
 #define pn_collector_hashcode NULL
 #define pn_collector_compare NULL
 
+PN_CLASSDEF(pn_collector)
+
 pn_collector_t *pn_collector(void)
 {
-  static const pn_class_t clazz = PN_CLASS(pn_collector);
-  pn_collector_t *collector = (pn_collector_t *) pn_class_new(&clazz, sizeof(pn_collector_t));
-  return collector;
+  return pn_collector_new();
 }
 
 void pn_collector_free(pn_collector_t *collector)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org