Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 312006 Details for
Bug 437724
handler not found noise in log on startup
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
dhcdbd-2.2-log-debug.patch
dhcdbd-2.2-log-debug.patch (text/plain), 26.13 KB, created by
David Cantrell
on 2008-07-17 01:12:33 UTC
(
hide
)
Description:
dhcdbd-2.2-log-debug.patch
Filename:
MIME Type:
Creator:
David Cantrell
Created:
2008-07-17 01:12:33 UTC
Size:
26.13 KB
patch
obsolete
>diff -up dhcdbd-2.2//src/dbus_service.c.debug dhcdbd-2.2//src/dbus_service.c >--- dhcdbd-2.2//src/dbus_service.c.debug 2006-08-24 06:52:14.000000000 -1000 >+++ dhcdbd-2.2//src/dbus_service.c 2008-07-16 15:11:07.000000000 -1000 >@@ -131,8 +131,8 @@ static DBusHandlerResult message_handler > (*(cs->dh)) ("message_handler: dest:%s path:%s member:%s interface:%s", dest, path, member, interface); > > if (path == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: message with NULL path"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: message with NULL path"); > return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; > } > >@@ -151,15 +151,15 @@ static DBusHandlerResult message_handler > } > > if (root->tree == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: not a prefix"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: not a prefix"); > return r; > } > > len = strlen (root->path); > if ((strlen (path) < len) || (strncmp (root->path, path, len) != 0)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: can't happen?!?: path %s not prefixed by %s", path, root->path); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: can't happen?!?: path %s not prefixed by %s", path, root->path); > return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; > } > >@@ -179,8 +179,8 @@ static DBusHandlerResult message_handler > } else if (member != 0L) { > snprintf(sub_path, 1024, "%s.%s", obj_suffix, member); > } else { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: null member for %s", path); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: null member for %s", path); > return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; > } > >@@ -197,8 +197,8 @@ static DBusHandlerResult message_handler > > mhpp = tfind (&mhn, &(root->tree), mh_comparator); > if ((mhpp == 0L) || ((mhp = *mhpp) == 0L)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: message handler not found under %s for sub-path %s", path, sub_path); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: message handler not found under %s for sub-path %s", path, sub_path); > > return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; > } >@@ -209,8 +209,8 @@ static DBusHandlerResult message_handler > mhn.path = (char *) sub_path; > mhpp = tfind (&mhn, &(root->tree), mh_comparator); > if ((mhpp == 0L) || ((mhp = *mhpp) == 0L)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("message_handler: message handler returned HANDLED_NOW for unhandled path %s", sub_path); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("message_handler: message handler returned HANDLED_NOW for unhandled path %s", sub_path); > return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; > } > r = ((*(mhp->mh)) (cs, type, reply, serial, dest, path, member, interface, if_suffix, sender, signature, message, root->path, obj_suffix, root->object, mhp->object)); >@@ -233,8 +233,8 @@ uint8_t dbus_svc_add_path_handler(DBusCo > char *path, *ifp = 0L; > > if ((rootPath == 0L) || (*rootPath == '\0') || (*rootPath != '/')) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_handler: invalid path %s", rootPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_handler: invalid path %s", rootPath); > return (0); > } > >@@ -242,15 +242,15 @@ uint8_t dbus_svc_add_path_handler(DBusCo > path = (char *) malloc (strlen (rootPath) + 1); > > if ((path == 0L) || (root == 0L)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_path_handler: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_path_handler: out of memory"); > return (0); > } > > if (ifPrefix != 0L) { > if ((ifp = (char *) malloc (strlen (ifPrefix) + 1)) == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_path_handler: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_path_handler: out of memory"); > return (0); > } > >@@ -271,8 +271,8 @@ uint8_t dbus_svc_add_path_handler(DBusCo > (isPrefix && !dbus_connection_register_fallback(cs->connection, > rootPath, &vtable, > root))) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_handler failed for: %s: %s", rootPath, isPrefix ? "dbus_connection_register_fallback failed" : "dbus_connection_register_object_path failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_handler failed for: %s: %s", rootPath, isPrefix ? "dbus_connection_register_fallback failed" : "dbus_connection_register_object_path failed"); > return (0); > } > >@@ -292,8 +292,8 @@ uint8_t dbus_svc_remove_path_handler(DBu > const Root *root, *const *rpp; > > if ((rootPath == 0L) || (*rootPath == '\0') || (*rootPath != '/')) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_remove_path: bad root path %s", rootPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_remove_path: bad root path %s", rootPath); > return 0; > } > >@@ -302,16 +302,16 @@ uint8_t dbus_svc_remove_path_handler(DBu > rpp = tfind (&r, &(cs->roots), root_comparator); > > if ((rpp == 0L) || ((root = *rpp) == 0L)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_remove_path_handler: cannot remove nonexistent root node %s", rootPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_remove_path_handler: cannot remove nonexistent root node %s", rootPath); > return 0; > } > > tdelete (root, &(cs->roots), root_comparator); > > if (!dbus_connection_unregister_object_path (cs->connection, rootPath)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_remove_path_handler:" "dbus_connection_unregister_object_path failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_remove_path_handler:" "dbus_connection_unregister_object_path failed"); > return (0); > } > >@@ -333,8 +333,8 @@ static uint8_t add_handler(DBusConnectio > mhn = (MessageHandlerNode *) malloc (sizeof (MessageHandlerNode)); > > if (mhn == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_handler: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_handler: out of memory"); > return (0); > } > >@@ -372,8 +372,8 @@ uint8_t dbus_svc_add_handler(DBusConnect > int len; > > if ((root == 0L) || (objectPath == 0L) || (*objectPath == '\0')) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_handler: bad path %s/%s", rootPath, objectPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_handler: bad path %s/%s", rootPath, objectPath); > return 0; > } > >@@ -381,29 +381,29 @@ uint8_t dbus_svc_add_handler(DBusConnect > > if (strncmp (root->path, objectPath, len) == 0) { > if (*(objectPath + len) == '\0') { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_handler: cannot add object path %s - identical to prefix path", objectPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_handler: cannot add object path %s - identical to prefix path", objectPath); > return (0); > } else if ((*(objectPath + len) == '/') > && (*(objectPath + len + 1) != '\0') > && (*(objectPath + len + 1) != '/')) { >- (*cs->eh) ("dbus_svc_add_handler: invalid object path %s", (objectPath + len)); >+ (*cs->dh) ("dbus_svc_add_handler: invalid object path %s", (objectPath + len)); > return 0; > } else if (*(objectPath + len) != '/') { >- (*cs->eh) ("dbus_svc_add_handler: invalid object path %s", (objectPath + len)); >+ (*cs->dh) ("dbus_svc_add_handler: invalid object path %s", (objectPath + len)); > return 0; > } > > objectPath += len + 1; > } else if (*objectPath == '/') { > if ((*(objectPath + 1) == '\0') || (*(objectPath + 1) == '/')) { >- (*cs->eh) ("dbus_svc_add_handler: invalid object path %s", objectPath); >+ (*cs->dh) ("dbus_svc_add_handler: invalid object path %s", objectPath); > return 0; > } > > objectPath += 1; > } else if (*objectPath == '\0') { >- (*cs->eh) ("dbus_svc_add_handler: empty object path"); >+ (*cs->dh) ("dbus_svc_add_handler: empty object path"); > return 0; > } > >@@ -416,8 +416,8 @@ uint8_t dbus_svc_remove_handler(DBusConn > Root *root = find_root (cs, rootPath); > > if ((root == 0L) || (objectPath == 0L) || (*objectPath == '\0')) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_remove_handler: unhandled path %s/%s", rootPath, objectPath); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_remove_handler: unhandled path %s/%s", rootPath, objectPath); > return (0); > } > >@@ -501,16 +501,16 @@ uint8_t dbus_svc_add_message_filter(DBus > va_start(va, n_matches); > > if (!dbus_connection_add_filter(cs->connection, message_filter, cs, NULL)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_filter: dbus_connection_add_filter failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_filter: dbus_connection_add_filter failed"); > va_end (va); > return (0); > } > > mfn = (MessageFilterNode *) malloc (sizeof (MessageFilterNode)); > if (mfn == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_filter: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_filter: out of memory"); > va_end (va); > return (0); > } >@@ -525,8 +525,8 @@ uint8_t dbus_svc_add_message_filter(DBus > > mp = mfn->matches = (char **) calloc(n_matches + 1, sizeof (char *)); > if (mp == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_filter: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_filter: out of memory"); > va_end (va); > return (0); > } >@@ -535,8 +535,8 @@ uint8_t dbus_svc_add_message_filter(DBus > m = va_arg(va, char *); > > if ((*mp = (char *) malloc(strlen (m) + 1)) == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_filter: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_filter: out of memory"); > va_end(va); > return (0); > } >@@ -545,8 +545,8 @@ uint8_t dbus_svc_add_message_filter(DBus > dbus_bus_add_match(cs->connection, *mp, &error); > > if (dbus_error_is_set (&error)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_add_message_filter: dbus_bus_add_match failed for %s: %s %s", *mp, error.name, error.message); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_add_message_filter: dbus_bus_add_match failed for %s: %s %s", *mp, error.name, error.message); > va_end(va); > return (0); > } >@@ -580,8 +580,8 @@ uint8_t dbus_svc_remove_message_filter(D > /* XXX fixme: what if other handlers still > * want to match this match exp.? */ > if (dbus_error_is_set (&error)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_remove_message_filter: remove match failed: %s %s", error.name, error.message); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_remove_message_filter: remove match failed: %s %s", error.name, error.message); > } > } > >@@ -607,11 +607,11 @@ uint8_t dbus_svc_get_args_va(DBusConnect > if ((!dbus_message_get_args_valist (msg, &error, firstType, va)) || > dbus_error_is_set (&error)) { > if (dbus_error_is_set (&error)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_get_args failed: %s %s", error.name, error.message); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_get_args failed: %s %s", error.name, error.message); > dbus_error_free(&error); >- } else if (cs->eh != 0L) { >- (*(cs->eh)) ("dbus_svc_get_args failed: dbus_message_get_args_valist failed"); >+ } else if (cs->dh != 0L) { >+ (*(cs->dh)) ("dbus_svc_get_args failed: dbus_message_get_args_valist failed"); > } > > return (0); >@@ -644,15 +644,15 @@ uint8_t dbus_svc_send_va(DBusConnectionS > member); > > if (msg == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_svc_new_message failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_svc_new_message failed"); > return 0; > } > > if (type != DBUS_MESSAGE_TYPE_ERROR) { > if (!dbus_message_append_args_valist(msg, firstType, va)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_append_args_valist failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_append_args_valist failed"); > return 0; > } > } else { >@@ -661,8 +661,8 @@ uint8_t dbus_svc_send_va(DBusConnectionS > e = va_arg(va, char *); > > if ((e == 0L) || !dbus_message_set_error_name (msg, e)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_set_error_name failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_set_error_name failed"); > return 0; > } > >@@ -673,29 +673,29 @@ uint8_t dbus_svc_send_va(DBusConnectionS > e = va_arg(va, char *); > > if (e == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: NULL error message"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: NULL error message"); > return 0; > } > > dbus_message_iter_init_append(msg, &iter); > > if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &e)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_iter_append_basic failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_iter_append_basic failed"); > return 0; > } > } > } else { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: unhandled type for error name: %c", firstType); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: unhandled type for error name: %c", firstType); > return 0; > } > } > > if (!dbus_connection_send(cs->connection, msg, new_serial)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_send failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_send failed"); > return 0; > } > >@@ -729,40 +729,40 @@ dbus_svc_MessageHandle dbus_svc_new_mess > DBusMessage *msg = dbus_message_new(type); > > if (msg == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_reply_serial failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_reply_serial failed"); > return 0; > } > > if (reply_serial != -1) { > if (!dbus_message_set_reply_serial(msg, reply_serial)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_reply_serial failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_reply_serial failed"); > return 0; > } > } > > if ((destination != 0L) && !dbus_message_set_destination(msg, destination)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_destination failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_destination failed"); > return 0; > } > > if (!dbus_message_set_path(msg, path)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_path failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_path failed"); > return 0; > } > > if (!dbus_message_set_interface(msg, interface)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_interface failed - %s", interface); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_interface failed - %s", interface); > return 0; > } > > if (!dbus_message_set_member(msg, member)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_new_message: dbus_message_set_member failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_new_message: dbus_message_set_member failed"); > return 0; > } > >@@ -773,8 +773,8 @@ extern uint8_t dbus_svc_send_message(DBu > dbus_svc_MessageHandle msg, > uint32_t * new_serial) { > if (!dbus_connection_send(cs->connection, msg, new_serial)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_send failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_send failed"); > return 0; > } > >@@ -793,8 +793,8 @@ extern uint8_t dbus_svc_message_append_a > va_start(va, firstType); > > if (!dbus_message_append_args_valist(msg, firstType, va)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_send: dbus_message_append_args failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_send: dbus_message_append_args failed"); > return 0; > } > >@@ -820,16 +820,16 @@ dbus_svc_MessageHandle dbus_svc_call(DBu > message = dbus_message_new_method_call(destination, path, > interface, member); > if (message == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_call: dbus_message_new_method_call failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_call: dbus_message_new_method_call failed"); > > va_end(va); > return (0L); > } > > if (!dbus_message_append_args_valist(message, firstType, va)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_call: dbus_message_append_args_valist failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_call: dbus_message_append_args_valist failed"); > > va_end(va); > return (0L); >@@ -838,8 +838,8 @@ dbus_svc_MessageHandle dbus_svc_call(DBu > reply = dbus_connection_send_with_reply_and_block(cs->connection, message, > reply_timeout, &error); > if (reply == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("dbus_svc_call: dbus_message_send_with_reply_and_block failed: %s %s", error.name, error.message); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("dbus_svc_call: dbus_message_send_with_reply_and_block failed: %s %s", error.name, error.message); > > va_end (va); > return (0L); >@@ -893,8 +893,8 @@ static dbus_bool_t add_timeout(DBusTimeo > return TRUE; > } > >- if (cs->eh != 0L) >- (*(cs->eh)) ("add_timeout: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("add_timeout: out of memory"); > > return FALSE; > } >@@ -909,11 +909,11 @@ static void remove_timeout(DBusTimeout * > > if (tdelete((const void *) to, &(cs->timeouts), ptr_key_comparator) != 0L) { > free(to); >- } else if (cs->eh != 0L) { >- (*(cs->eh)) ("remove_timeout: can't happen?!?: timeout data %p not found", to); >+ } else if (cs->dh != 0L) { >+ (*(cs->dh)) ("remove_timeout: can't happen?!?: timeout data %p not found", to); > } >- } else if (cs->eh != 0L) { >- (*(cs->eh)) ("remove_timeout: can't happen?!?: timeout %p did not record data %p %p", timeout, to, ((to != 0L) ? to->to : 0L)); >+ } else if (cs->dh != 0L) { >+ (*(cs->dh)) ("remove_timeout: can't happen?!?: timeout %p did not record data %p %p", timeout, to, ((to != 0L) ? to->to : 0L)); > } > } > >@@ -931,8 +931,8 @@ static void toggle_timeout(DBusTimeout * > to->tv.tv_sec = 0; > to->tv.tv_usec = 0; > } >- } else if (cs->eh != 0L) { >- (*(cs->eh)) ("toggle_timeout: can't happen?!?: timeout %p %s %p %p", timeout, ((to == 0L) ? "did not record data" : "not found"), to, ((to != 0L) ? to->to : 0L)); >+ } else if (cs->dh != 0L) { >+ (*(cs->dh)) ("toggle_timeout: can't happen?!?: timeout %p %s %p %p", timeout, ((to == 0L) ? "did not record data" : "not found"), to, ((to != 0L) ? to->to : 0L)); > } > } > >@@ -1014,8 +1014,8 @@ static dbus_bool_t add_watch(DBusWatch * > (*(cs->dh)) ("add_watch: %d", dbus_watch_get_fd (watch)); > > if (tsearch((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("add_watch: out of memory"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("add_watch: out of memory"); > > return FALSE; > } >@@ -1031,8 +1031,8 @@ static void remove_watch(DBusWatch * wat > int fd = dbus_watch_get_fd(watch); > > if (tdelete((const void *) watch, &(cs->watches), ptr_key_comparator) == 0L) >- if (cs->eh != 0L) >- (*(cs->eh)) ("remove_watch: can't happen?!?: watch not found"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("remove_watch: can't happen?!?: watch not found"); > > if (cs->dh != 0L) > (*(cs->dh)) ("remove_watch: %d", dbus_watch_get_fd(watch)); >@@ -1099,7 +1099,7 @@ static DBusConnectionState * connection_ > DBusConnectionState *cs = dbcs_new(connection); > > if (cs == 0L) { >- (*(eh)) ("connection_setup: out of memory"); >+ (*(dh)) ("connection_setup: out of memory"); > goto fail; > } > >@@ -1107,15 +1107,15 @@ static DBusConnectionState * connection_ > cs->dh = dh; > > if (!dbus_connection_set_watch_functions(cs->connection, add_watch, remove_watch, toggle_watch, cs, no_free)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("connection_setup: dbus_connection_set_watch_functions failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("connection_setup: dbus_connection_set_watch_functions failed"); > > goto fail; > } > > if (!dbus_connection_set_timeout_functions(connection, add_timeout, remove_timeout, toggle_timeout, cs, no_free)) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("connection_setup: dbus_connection_set_timeout_functions failed"); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("connection_setup: dbus_connection_set_timeout_functions failed"); > > goto fail; > } >@@ -1152,8 +1152,8 @@ void dbus_svc_main_loop(DBusConnectionSt > > if ((n_fds = select(cs->n, &(cs->s_r_fds), &(cs->s_w_fds), &(cs->s_e_fds), &timeout)) < 0) { > if (errno != EINTR) { >- if (cs->eh != 0L) >- (*(cs->eh)) ("select failed: %d : %s", errno, strerror(errno)); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("select failed: %d : %s", errno, strerror(errno)); > > return; > } >@@ -1186,14 +1186,14 @@ DBusConnectionState *dbus_svc_init(dbus_ > dbus_error_init(&error); > > if ((connection = dbus_bus_get(bus, &error)) == 0L) { >- (*eh) ("dbus_svc_init failed: %s %s", error.name, error.message); >+ (*dh) ("dbus_svc_init failed: %s %s", error.name, error.message); > return (0L); > } > > dbus_connection_set_exit_on_disconnect(connection, FALSE); > > if ((cs = connection_setup(connection, eh, dh)) == 0L) { >- (*eh) ("dbus_svc_init failed: connection_setup failed"); >+ (*dh) ("dbus_svc_init failed: connection_setup failed"); > return (0L); > } > >@@ -1206,10 +1206,10 @@ DBusConnectionState *dbus_svc_init(dbus_ > case DBUS_REQUEST_NAME_REPLY_EXISTS: > case DBUS_REQUEST_NAME_REPLY_IN_QUEUE: > case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER: >- (*eh) ("dbus_svc_init: dbus_bus_request_name failed: Name already registered"); >+ (*dh) ("dbus_svc_init: dbus_bus_request_name failed: Name already registered"); > goto give_up; > default: >- (*eh) ("dbus_svc_init: dbus_bus_request_name failed: %s %s", error.name, error.message); >+ (*dh) ("dbus_svc_init: dbus_bus_request_name failed: %s %s", error.name, error.message); > goto give_up; > } > >@@ -1234,12 +1234,12 @@ static void free_root(void *rp) { > > void dbus_svc_shutdown(DBusConnectionState * cs) { > if (!dbus_connection_set_watch_functions(cs->connection, NULL, NULL, NULL, NULL, NULL)) >- if (cs->eh != 0L) >- (*(cs->eh)) ("connection_shutdown: dbus_connection_set_watch_functions: No Memory." "Setting watch functions to NULL failed."); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("connection_shutdown: dbus_connection_set_watch_functions: No Memory." "Setting watch functions to NULL failed."); > > if (!dbus_connection_set_timeout_functions(cs->connection, NULL, NULL, NULL, NULL, NULL)) >- if (cs->eh != 0L) >- (*(cs->eh)) ("connection_shutdown: dbus_connection_set_timeout_functions: No Memory." "Setting timeout functions to NULL failed."); >+ if (cs->dh != 0L) >+ (*(cs->dh)) ("connection_shutdown: dbus_connection_set_timeout_functions: No Memory." "Setting timeout functions to NULL failed."); > > dbus_connection_set_dispatch_status_function(cs->connection, NULL, NULL, NULL); >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 437724
: 312006