diff options
| -rw-r--r-- | src/core/epc-glib.c | 3 | ||||
| -rw-r--r-- | src/core/event_processor.c | 2 | ||||
| -rw-r--r-- | src/database/database_nop.c | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/core/epc-glib.c b/src/core/epc-glib.c index d0f33b6..85815df 100644 --- a/src/core/epc-glib.c +++ b/src/core/epc-glib.c @@ -59,11 +59,12 @@ static void finalize(GSource *source) sd_event_unref(s->event); } -static void epc_on_exit(sd_event_source *s, void *userdata) +static int epc_on_exit(sd_event_source *s, void *userdata) { GMainLoop *gloop = userdata; g_main_loop_quit(gloop); + return 0; } static GSourceFuncs source_funcs = { diff --git a/src/core/event_processor.c b/src/core/event_processor.c index 51726b1..125a65d 100644 --- a/src/core/event_processor.c +++ b/src/core/event_processor.c @@ -140,7 +140,6 @@ EPC_MODULE_REGISTER(&event_processor.module); int event_processor_report_event(struct epc_event *ev) { struct epc_object *obj; - epc_oid_t oid; int ret; epc_object_new(&obj); @@ -150,7 +149,6 @@ int event_processor_report_event(struct epc_event *ev) if (ret < 0) log_warning_errno(ret, "Could not save event to database: %m"); -unref_obj: epc_object_unref(obj); return append_epc_event(&event_processor.pending_events, ev); diff --git a/src/database/database_nop.c b/src/database/database_nop.c index 07a4f70..fa3ba71 100644 --- a/src/database/database_nop.c +++ b/src/database/database_nop.c @@ -63,7 +63,8 @@ static int nop_store(struct epc_database_adapter *adapter, ret = epc_object_get_oid(obj, NOP_ID_KEY_NAME, oid); if (ret == -ENOENT) { - ret = strncpy(oid->nop, NOP_DEFAULT_OID, OID_NOP_SIZE); + strncpy(oid->nop, NOP_DEFAULT_OID, OID_NOP_SIZE); + ret = 0; } return ret; @@ -72,7 +73,8 @@ static int nop_store(struct epc_database_adapter *adapter, static int nop_get_well_known_oid(const char *name, epc_oid_t *oid) { - return strncpy(oid->nop, NOP_DEFAULT_OID, OID_NOP_SIZE); + strncpy(oid->nop, NOP_DEFAULT_OID, OID_NOP_SIZE); + return 0; } static bool nop_is_oid_valid(epc_oid_t *oid) |