--- doc/coding-style.txt | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/doc/coding-style.txt b/doc/coding-style.txt index eccdacc..76e6053 100644 --- a/doc/coding-style.txt +++ b/doc/coding-style.txt @@ -209,6 +209,27 @@ However if the enum comes from an external header file outside ofono we cannot make any assumption of how the enum is defined and this rule might not apply. +M13: Check for pointer being NULL +================================= + +When checking if a pointer or a return value is NULL, explicitly compare to +NULL rather than use the shorter check with "!" operator. + +Example: +1) +array = g_try_new0(int, 20); +if (!array) // Wrong + return; + +2) +if (!g_at_chat_get_slave(chat)) // Wrong + return -EINVAL; + +3) +array = g_try_new0(int, 20); +if (!array) // Correct + return; + O1: Shorten the name ==================== Better to use abbreviation, rather than full name, to name a variable, -- 1.7.3.2

This patch was generated by the following semantic patch (http://coccinelle.lip6.fr/) // <smpl> @fix disable is_null,isnt_null1@ expression *E; @@ - !E + E == NULL // </smpl> --- unit/test-caif.c | 2 +- unit/test-mux.c | 2 +- unit/test-simutil.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unit/test-caif.c b/unit/test-caif.c index 51e29bc..2c63d4c 100644 --- a/unit/test-caif.c +++ b/unit/test-caif.c @@ -124,7 +124,7 @@ static void test_connect(gboolean use_socket) g_io_channel_unref(io); - if (!chat) { + if (chat == NULL) { g_printerr("Chat creation failed\n"); return; } diff --git a/unit/test-mux.c b/unit/test-mux.c index e80b47c..d0e2d32 100644 --- a/unit/test-mux.c +++ b/unit/test-mux.c @@ -201,7 +201,7 @@ static void test_mux(void) g_io_channel_unref(io); - if (!chat) { + if (chat == NULL) { g_printerr("Chat creation failed\n"); return; } diff --git a/unit/test-simutil.c b/unit/test-simutil.c index 7aa09b4..155cddd 100644 --- a/unit/test-simutil.c +++ b/unit/test-simutil.c @@ -372,7 +372,7 @@ static void test_eons() sim_eons_optimize(eons_info); op_info = sim_eons_lookup(eons_info, "246", "82"); - g_assert(!op_info); + g_assert(op_info == NULL); op_info = sim_eons_lookup(eons_info, "246", "81"); g_assert(op_info); @@ -391,7 +391,7 @@ static void test_ef_db() g_assert(info); info = sim_ef_db_lookup(0x6FB1); - g_assert(!info); + g_assert(info == NULL); info = sim_ef_db_lookup(0x2F05); g_assert(info); -- 1.7.3.2

This patch was generated by the following semantic patch (http://coccinelle.lip6.fr/) // <smpl> @fix disable is_null,isnt_null1@ expression *E; @@ - !E + E == NULL // </smpl> --- examples/nettime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/examples/nettime.c b/examples/nettime.c index 60045be..3843ce2 100644 --- a/examples/nettime.c +++ b/examples/nettime.c @@ -50,7 +50,7 @@ static void example_nettime_remove(struct ofono_nettime_context *context) static void example_nettime_info_received(struct ofono_nettime_context *context, struct ofono_network_time *info) { - if (!info) + if (info == NULL) return; ofono_debug("Received a network time notification on modem: %p", -- 1.7.3.2

This patch was generated by the following semantic patch (http://coccinelle.lip6.fr/) // <smpl> @fix disable is_null,isnt_null1@ expression *E; @@ - !E + E == NULL // </smpl> --- gdbus/object.c | 24 ++++++++++++------------ gdbus/polkit.c | 2 +- gdbus/watch.c | 21 ++++++++++----------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/gdbus/object.c b/gdbus/object.c index cc3c5da..d881c58 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -201,12 +201,12 @@ static DBusMessage *introspect(DBusConnection *connection, return NULL; } - if (!data->introspect) + if (data->introspect == NULL) generate_introspection_xml(connection, data, dbus_message_get_path(message)); reply = dbus_message_new_method_return(message); - if (!reply) + if (reply == NULL) return NULL; dbus_message_append_args(reply, DBUS_TYPE_STRING, &data->introspect, @@ -405,7 +405,7 @@ static struct interface_data *find_interface(GSList *interfaces, { GSList *list; - if (!name) + if (name == NULL) return NULL; for (list = interfaces; list; list = list->next) { @@ -428,7 +428,7 @@ static DBusHandlerResult generic_message(DBusConnection *connection, interface = dbus_message_get_interface(message); iface = find_interface(data->interfaces, interface); - if (!iface) + if (iface == NULL) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; for (method = iface->methods; method && @@ -464,7 +464,7 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) parent_path = g_strdup(child_path); slash = strrchr(parent_path, '/'); - if (!slash) + if (slash == NULL) goto done; if (slash == parent_path && parent_path[1] != '\0') @@ -481,7 +481,7 @@ static void invalidate_parent_data(DBusConnection *conn, const char *child_path) goto done; } - if (!data) + if (data == NULL) goto done; g_free(data->introspect); @@ -554,7 +554,7 @@ static gboolean remove_interface(struct generic_data *data, const char *name) struct interface_data *iface; iface = find_interface(data->interfaces, name); - if (!iface) + if (iface == NULL) return FALSE; data->interfaces = g_slist_remove(data->interfaces, iface); @@ -601,14 +601,14 @@ static gboolean check_signal(DBusConnection *conn, const char *path, *args = NULL; if (!dbus_connection_get_object_path_data(conn, path, - (void *) &data) || !data) { + (void *) &data) || data == NULL) { error("dbus_connection_emit_signal: path %s isn't registered", path); return FALSE; } iface = find_interface(data->interfaces, interface); - if (!iface) { + if (iface == NULL) { error("dbus_connection_emit_signal: %s does not implement %s", path, interface); return FALSE; @@ -621,7 +621,7 @@ static gboolean check_signal(DBusConnection *conn, const char *path, } } - if (!*args) { + if (*args == NULL) { error("No signal named %s on interface %s", name, interface); return FALSE; } @@ -644,7 +644,7 @@ static dbus_bool_t emit_signal_valist(DBusConnection *conn, return FALSE; signal = dbus_message_new_signal(path, interface, name); - if (!signal) { + if (signal == NULL) { error("Unable to allocate new %s.%s signal", interface, name); return FALSE; } @@ -702,7 +702,7 @@ gboolean g_dbus_unregister_interface(DBusConnection *connection, { struct generic_data *data = NULL; - if (!path) + if (path == NULL) return FALSE; if (dbus_connection_get_object_path_data(connection, path, diff --git a/gdbus/polkit.c b/gdbus/polkit.c index ed876ca..aef5075 100644 --- a/gdbus/polkit.c +++ b/gdbus/polkit.c @@ -163,7 +163,7 @@ int polkit_check_authorization(DBusConnection *conn, msg = dbus_message_new_method_call(AUTHORITY_DBUS, AUTHORITY_PATH, AUTHORITY_INTF, "CheckAuthorization"); - if (!msg) { + if (msg == NULL) { dbus_free(data); return -ENOMEM; } diff --git a/gdbus/watch.c b/gdbus/watch.c index c0dcc93..e7c203a 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -204,8 +204,7 @@ static struct filter_data *filter_data_get(DBusConnection *connection, struct filter_data *data; const char *name = NULL, *owner = NULL; - if (!filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, - NULL)) { + if (filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL) == NULL) { if (!dbus_connection_add_filter(connection, message_filter, NULL, NULL)) { error("dbus_connection_add_filter() failed"); @@ -382,7 +381,7 @@ static gboolean filter_data_remove_callback(struct filter_data *data, /* Remove filter if there are no listeners left for the connection */ data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL); - if (!data) + if (data == NULL) dbus_connection_remove_filter(connection, message_filter, NULL); @@ -480,7 +479,7 @@ static DBusHandlerResult service_filter(DBusConnection *connection, /* Only auto remove if it is a bus name watch */ if (data->argument[0] == ':' && - (!cb->conn_func || !cb->disc_func)) { + (cb->conn_func == NULL || cb->disc_func == NULL)) { filter_data_remove_callback(data, cb); continue; } @@ -517,7 +516,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, /* Sender is always bus name */ data = filter_data_find(connection, NULL, sender, path, iface, member, arg); - if (!data) { + if (data == NULL) { error("Got %s.%s signal which has no listeners", iface, member); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -543,7 +542,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, /* Remove filter if there no listener left for the connection */ data = filter_data_find(connection, NULL, NULL, NULL, NULL, NULL, NULL); - if (!data) + if (data == NULL) dbus_connection_remove_filter(connection, message_filter, NULL); @@ -658,18 +657,18 @@ guint g_dbus_add_service_watch(DBusConnection *connection, const char *name, struct filter_data *data; struct filter_callback *cb; - if (!name) + if (name == NULL) return 0; data = filter_data_get(connection, service_filter, NULL, NULL, DBUS_INTERFACE_DBUS, "NameOwnerChanged", name); - if (!data) + if (data == NULL) return 0; cb = filter_data_add_callback(data, connect, disconnect, NULL, NULL, user_data); - if (!cb) + if (cb == NULL) return 0; if (connect) @@ -697,12 +696,12 @@ guint g_dbus_add_signal_watch(DBusConnection *connection, data = filter_data_get(connection, signal_filter, sender, path, interface, member, NULL); - if (!data) + if (data == NULL) return 0; cb = filter_data_add_callback(data, NULL, NULL, function, destroy, user_data); - if (!cb) + if (cb == NULL) return 0; if (data->name != NULL && data->name_watch == 0) -- 1.7.3.2

This patch was generated by the following semantic patch (http://coccinelle.lip6.fr/) // <smpl> @fix disable is_null,isnt_null1@ expression *E; @@ - !E + E == NULL // </smpl> --- src/audio-settings.c | 12 ++++---- src/call-barring.c | 18 ++++++------ src/call-forwarding.c | 20 +++++++------- src/call-meter.c | 26 +++++++++--------- src/call-settings.c | 26 +++++++++--------- src/call-volume.c | 6 ++-- src/cbs.c | 16 +++++----- src/common.c | 2 +- src/dbus.c | 8 +++--- src/gprs.c | 28 ++++++++++---------- src/history.c | 2 +- src/main.c | 2 +- src/message-waiting.c | 4 +- src/modem.c | 14 +++++----- src/nettime.c | 2 +- src/network.c | 28 ++++++++++---------- src/phonebook.c | 10 +++--- src/plugin.c | 2 +- src/radio-settings.c | 20 +++++++------- src/sim.c | 16 +++++----- src/simfs.c | 28 ++++++++++---------- src/simutil.c | 16 +++++----- src/sms.c | 40 ++++++++++++++-------------- src/smsagent.c | 12 ++++---- src/smsutil.c | 34 ++++++++++++------------ src/stk.c | 62 +++++++++++++++++++++--------------------- src/stkagent.c | 2 +- src/stkutil.c | 4 +- src/ussd.c | 46 ++++++++++++++++---------------- src/util.c | 14 +++++----- src/voicecall.c | 70 ++++++++++++++++++++++++------------------------ 31 files changed, 295 insertions(+), 295 deletions(-) diff --git a/src/audio-settings.c b/src/audio-settings.c index ed3e7d1..5d59020 100644 --- a/src/audio-settings.c +++ b/src/audio-settings.c @@ -73,7 +73,7 @@ void ofono_audio_settings_mode_notify(struct ofono_audio_settings *as, g_free(as->mode); as->mode = g_strdup(mode); - if (!as->mode) + if (as->mode == NULL) return; ofono_dbus_signal_property_changed(conn, path, @@ -89,7 +89,7 @@ static DBusMessage *audio_get_properties_reply(DBusMessage *msg, DBusMessageIter dict; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -132,7 +132,7 @@ int ofono_audio_settings_driver_register(const struct ofono_audio_settings_drive { DBG("driver: %p, name: %s", d, d->name); - if (!d->probe) + if (d->probe == NULL) return -EINVAL; g_drivers = g_slist_prepend(g_drivers, (void *) d); @@ -164,7 +164,7 @@ static void audio_settings_remove(struct ofono_atom *atom) DBG("atom: %p", atom); - if (!as) + if (as == NULL) return; if (as->driver && as->driver->remove) @@ -182,11 +182,11 @@ struct ofono_audio_settings *ofono_audio_settings_create(struct ofono_modem *mod struct ofono_audio_settings *as; GSList *l; - if (!driver) + if (driver == NULL) return NULL; as = g_try_new0(struct ofono_audio_settings, 1); - if (!as) + if (as == NULL) return NULL; as->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_AUDIO_SETTINGS, diff --git a/src/call-barring.c b/src/call-barring.c index db32c0c..bb15530 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -385,7 +385,7 @@ static gboolean cb_ss_control(int type, const char *sc, type, sc, sia, sib, sic, dn); fac = cb_ss_service_to_fac(sc); - if (!fac) + if (fac == NULL) return FALSE; cb_set_query_bounds(cb, fac, type == SS_CONTROL_TYPE_QUERY); @@ -419,7 +419,7 @@ static gboolean cb_ss_control(int type, const char *sc, break; } - if (!operation) { + if (operation == NULL) { reply = __ofono_error_not_implemented(msg); g_dbus_send_message(conn, reply); @@ -521,7 +521,7 @@ static gboolean cb_ss_passwd(const char *sc, else fac = cb_ss_service_to_fac(sc); - if (!fac) + if (fac == NULL) return FALSE; if (!is_valid_pin(old, PIN_TYPE_NET) || !is_valid_pin(new, PIN_TYPE_NET)) @@ -618,7 +618,7 @@ static void cb_get_properties_reply(struct ofono_call_barring *cb, int mask) ofono_error("Generating a get_properties reply with no cache"); reply = dbus_message_new_method_return(cb->pending); - if (!reply) + if (reply == NULL) return; dbus_message_iter_init_append(reply, &iter); @@ -678,7 +678,7 @@ static DBusMessage *cb_get_properties(DBusConnection *conn, DBusMessage *msg, if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) return __ofono_error_busy(msg); - if (!cb->driver->query) + if (cb->driver->query == NULL) return __ofono_error_not_implemented(msg); cb->pending = dbus_message_ref(msg); @@ -866,7 +866,7 @@ static DBusMessage *cb_set_property(DBusConnection *conn, DBusMessage *msg, return __ofono_error_invalid_format(msg); } - if (!cb->driver->set) + if (cb->driver->set == NULL) return __ofono_error_not_implemented(msg); cb_set_query_bounds(cb, cb_locks[lock].fac, FALSE); @@ -899,7 +899,7 @@ static DBusMessage *cb_disable_all(DBusConnection *conn, DBusMessage *msg, struct ofono_call_barring *cb = data; const char *passwd; - if (!cb->driver->set) + if (cb->driver->set == NULL) return __ofono_error_not_implemented(msg); if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) @@ -946,7 +946,7 @@ static DBusMessage *cb_set_passwd(DBusConnection *conn, DBusMessage *msg, const char *old_passwd; const char *new_passwd; - if (!cb->driver->set_passwd) + if (cb->driver->set_passwd == NULL) return __ofono_error_not_implemented(msg); if (__ofono_call_barring_is_busy(cb) || __ofono_ussd_is_busy(cb->ussd)) @@ -1013,7 +1013,7 @@ static void call_barring_outgoing_enabled_notify(int idx, void *userdata) signal = dbus_message_new_signal(path, OFONO_CALL_BARRING_INTERFACE, "OutgoingBarringInEffect"); - if (!signal) { + if (signal == NULL) { ofono_error("Unable to allocate new %s.OutgoingBarringInEffect" " signal", OFONO_CALL_BARRING_INTERFACE); return; diff --git a/src/call-forwarding.c b/src/call-forwarding.c index ce03c40..76aef73 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -113,7 +113,7 @@ static int cf_find_timeout(GSList *cf_list, int cls) l = g_slist_find_custom(cf_list, GINT_TO_POINTER(cls), cf_condition_find_with_cls); - if (!l) + if (l == NULL) return DEFAULT_NO_REPLY_TIMEOUT; c = l->data; @@ -158,7 +158,7 @@ static GSList *cf_cond_list_create(int total, continue; cond = g_try_new0(struct ofono_call_forwarding_condition, 1); - if (!cond) + if (cond == NULL) continue; memcpy(cond, &list[i], @@ -352,7 +352,7 @@ static void property_append_cf_conditions(DBusMessageIter *dict, while (l && (cf = l->data) && (cf->cls < i)) l = l->next; - if (!l || cf->cls != i) { + if (l == NULL || cf->cls != i) { property_append_cf_condition(dict, i, postfix, "", DEFAULT_NO_REPLY_TIMEOUT); continue; @@ -375,7 +375,7 @@ static DBusMessage *cf_get_properties_reply(DBusMessage *msg, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -436,7 +436,7 @@ static DBusMessage *cf_get_properties(DBusConnection *conn, DBusMessage *msg, if (cf->flags & CALL_FORWARDING_FLAG_CACHED) return cf_get_properties_reply(msg, cf); - if (!cf->driver->query) + if (cf->driver->query == NULL) return __ofono_error_not_implemented(msg); if (__ofono_call_forwarding_is_busy(cf) || @@ -634,7 +634,7 @@ static DBusMessage *cf_set_property(DBusConnection *conn, DBusMessage *msg, GINT_TO_POINTER(cls), cf_condition_find_with_cls); - if (!l) + if (l == NULL) return __ofono_error_failed(msg); c = l->data; @@ -713,7 +713,7 @@ static DBusMessage *cf_disable_all(DBusConnection *conn, DBusMessage *msg, const char *strtype; int type; - if (!cf->driver->erasure) + if (cf->driver->erasure == NULL) return __ofono_error_not_implemented(msg); if (__ofono_call_forwarding_is_busy(cf) || @@ -905,7 +905,7 @@ static gboolean cf_ss_control(int type, const char *sc, void *operation = NULL; /* Before we do anything, make sure we're actually initialized */ - if (!cf) + if (cf == NULL) return FALSE; if (__ofono_call_forwarding_is_busy(cf)) { @@ -1007,7 +1007,7 @@ static gboolean cf_ss_control(int type, const char *sc, break; } - if (!operation) { + if (operation == NULL) { reply = __ofono_error_not_implemented(msg); g_dbus_send_message(conn, reply); @@ -1016,7 +1016,7 @@ static gboolean cf_ss_control(int type, const char *sc, cf->ss_req = g_try_new0(struct cf_ss_request, 1); - if (!cf->ss_req) { + if (cf->ss_req == NULL) { reply = __ofono_error_failed(msg); g_dbus_send_message(conn, reply); diff --git a/src/call-meter.c b/src/call-meter.c index 568fe40..ac3ae6b 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -163,7 +163,7 @@ static void cm_get_properties_reply(struct ofono_call_meter *cm) const char *currency = cm->currency; reply = dbus_message_new_method_return(cm->pending); - if (!reply) + if (reply == NULL) return; dbus_message_iter_init_append(reply, &iter); @@ -204,7 +204,7 @@ static void query_call_meter_callback(const struct ofono_error *error, int value static void query_call_meter(struct ofono_call_meter *cm) { - if (!cm->driver->call_meter_query) { + if (cm->driver->call_meter_query == NULL) { if (cm->pending) cm_get_properties_reply(cm); @@ -227,7 +227,7 @@ static void query_acm_callback(const struct ofono_error *error, int value, static void query_acm(struct ofono_call_meter *cm) { - if (!cm->driver->acm_query) { + if (cm->driver->acm_query == NULL) { query_call_meter(cm); return; } @@ -250,7 +250,7 @@ static void query_acm_max_callback(const struct ofono_error *error, int value, static void query_acm_max(struct ofono_call_meter *cm) { - if (!cm->driver->acm_max_query) { + if (cm->driver->acm_max_query == NULL) { cm->flags |= CALL_METER_FLAG_CACHED; query_acm(cm); @@ -276,7 +276,7 @@ static void query_puct_callback(const struct ofono_error *error, static void query_puct(struct ofono_call_meter *cm) { - if (!cm->driver->puct_query) + if (cm->driver->puct_query == NULL) query_acm_max(cm); else cm->driver->puct_query(cm, query_puct_callback, cm); @@ -312,7 +312,7 @@ static void set_acm_max_query_callback(const struct ofono_error *error, int valu struct ofono_call_meter *cm = data; DBusMessage *reply; - if (!cm->pending) + if (cm->pending == NULL) return; if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { @@ -353,7 +353,7 @@ static DBusMessage *prop_set_acm_max(DBusMessage *msg, { dbus_uint32_t value; - if (!cm->driver->acm_max_set) + if (cm->driver->acm_max_set == NULL) return __ofono_error_not_implemented(msg); dbus_message_iter_get_basic(dbus_value, &value); @@ -372,7 +372,7 @@ static void set_puct_query_callback(const struct ofono_error *error, struct ofono_call_meter *cm = data; DBusMessage *reply; - if (!cm->pending) + if (cm->pending == NULL) return; if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { @@ -421,7 +421,7 @@ static void set_puct_initial_query_callback(const struct ofono_error *error, const char *name; const char *pin2; - if (!cm->pending) + if (cm->pending == NULL) return; if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { @@ -456,7 +456,7 @@ static DBusMessage *prop_set_ppu(DBusMessage *msg, struct ofono_call_meter *cm, { double ppu; - if (!cm->driver->puct_set || !cm->driver->puct_query) + if (cm->driver->puct_set == NULL || cm->driver->puct_query == NULL) return __ofono_error_not_implemented(msg); dbus_message_iter_get_basic(var, &ppu); @@ -480,7 +480,7 @@ static DBusMessage *prop_set_cur(DBusMessage *msg, struct ofono_call_meter *cm, { const char *value; - if (!cm->driver->puct_set || !cm->driver->puct_query) + if (cm->driver->puct_set == NULL || cm->driver->puct_query == NULL) return __ofono_error_not_implemented(msg); dbus_message_iter_get_basic(var, &value); @@ -570,7 +570,7 @@ static void reset_acm_query_callback(const struct ofono_error *error, int value, struct ofono_call_meter *cm = data; DBusMessage *reply; - if (!cm->pending) + if (cm->pending == NULL) return; if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { @@ -610,7 +610,7 @@ static DBusMessage *cm_acm_reset(DBusConnection *conn, DBusMessage *msg, struct ofono_call_meter *cm = data; const char *pin2; - if (!cm->driver->acm_reset) + if (cm->driver->acm_reset == NULL) return __ofono_error_not_implemented(msg); if (cm->pending) diff --git a/src/call-settings.c b/src/call-settings.c index c656833..5586e56 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -412,7 +412,7 @@ static gboolean cw_ss_control(int type, int cls = BEARER_CLASS_SS_DEFAULT; DBusMessage *reply; - if (!cs) + if (cs == NULL) return FALSE; if (strcmp(sc, "43")) @@ -426,8 +426,8 @@ static gboolean cw_ss_control(int type, if (strlen(sib) || strlen(sib) || strlen(dn)) goto bad_format; - if ((type == SS_CONTROL_TYPE_QUERY && !cs->driver->cw_query) || - (type != SS_CONTROL_TYPE_QUERY && !cs->driver->cw_set)) { + if ((type == SS_CONTROL_TYPE_QUERY && cs->driver->cw_query == NULL) || + (type != SS_CONTROL_TYPE_QUERY && cs->driver->cw_set == NULL)) { reply = __ofono_error_not_implemented(msg); goto error; } @@ -574,7 +574,7 @@ static gboolean clip_colp_colr_ss(int type, void (*query_op)(struct ofono_call_settings *cs, ofono_call_settings_status_cb_t cb, void *data); - if (!cs) + if (cs == NULL) return FALSE; if (__ofono_call_settings_is_busy(cs)) { @@ -605,7 +605,7 @@ static gboolean clip_colp_colr_ss(int type, return TRUE; } - if (!query_op) { + if (query_op == NULL) { DBusMessage *reply = __ofono_error_not_implemented(msg); g_dbus_send_message(conn, reply); @@ -694,7 +694,7 @@ static gboolean clir_ss_control(int type, struct ofono_call_settings *cs = data; DBusConnection *conn = ofono_dbus_get_connection(); - if (!cs) + if (cs == NULL) return FALSE; if (strcmp(sc, "31")) @@ -726,7 +726,7 @@ static gboolean clir_ss_control(int type, return TRUE; } - if (type != SS_CONTROL_TYPE_QUERY && !cs->driver->clir_set) { + if (type != SS_CONTROL_TYPE_QUERY && cs->driver->clir_set == NULL) { DBusMessage *reply = __ofono_error_not_implemented(msg); g_dbus_send_message(conn, reply); @@ -800,7 +800,7 @@ static DBusMessage *generate_get_properties_reply(struct ofono_call_settings *cs reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -859,7 +859,7 @@ out: static void query_clir(struct ofono_call_settings *cs) { - if (!cs->driver->clir_query) { + if (cs->driver->clir_query == NULL) { if (cs->pending) { DBusMessage *reply = generate_get_properties_reply(cs, @@ -886,7 +886,7 @@ static void cs_clip_callback(const struct ofono_error *error, static void query_clip(struct ofono_call_settings *cs) { - if (!cs->driver->clip_query) { + if (cs->driver->clip_query == NULL) { query_clir(cs); return; } @@ -907,7 +907,7 @@ static void cs_colp_callback(const struct ofono_error *error, static void query_colp(struct ofono_call_settings *cs) { - if (!cs->driver->colp_query) { + if (cs->driver->colp_query == NULL) { query_clip(cs); return; } @@ -928,7 +928,7 @@ static void cs_colr_callback(const struct ofono_error *error, static void query_colr(struct ofono_call_settings *cs) { - if (!cs->driver->colr_query) { + if (cs->driver->colr_query == NULL) { query_colp(cs); return; } @@ -949,7 +949,7 @@ static void cs_cw_callback(const struct ofono_error *error, int status, static void query_cw(struct ofono_call_settings *cs) { - if (!cs->driver->cw_query) { + if (cs->driver->cw_query == NULL) { query_colr(cs); return; } diff --git a/src/call-volume.c b/src/call-volume.c index 6f692f3..1e12d81 100644 --- a/src/call-volume.c +++ b/src/call-volume.c @@ -236,7 +236,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg, if (g_str_equal(property, "SpeakerVolume") == TRUE) { unsigned char percent; - if (!cv->driver->speaker_volume) + if (cv->driver->speaker_volume == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BYTE) @@ -258,7 +258,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg, } else if (g_str_equal(property, "MicrophoneVolume") == TRUE) { unsigned char percent; - if (!cv->driver->microphone_volume) + if (cv->driver->microphone_volume == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BYTE) @@ -280,7 +280,7 @@ static DBusMessage *cv_set_property(DBusConnection *conn, DBusMessage *msg, } else if (g_str_equal(property, "Muted") == TRUE) { dbus_bool_t muted; - if (!cv->driver->mute) + if (cv->driver->mute == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN) diff --git a/src/cbs.c b/src/cbs.c index 50e78c2..9c1abd0 100644 --- a/src/cbs.c +++ b/src/cbs.c @@ -132,7 +132,7 @@ static void cbs_dispatch_emergency(struct ofono_cbs *cbs, const char *message, signal = dbus_message_new_signal(path, OFONO_CELL_BROADCAST_INTERFACE, "EmergencyBroadcast"); - if (!signal) + if (signal == NULL) return; dbus_message_iter_init_append(signal, &iter); @@ -195,7 +195,7 @@ void ofono_cbs_notify(struct ofono_cbs *cbs, const unsigned char *pdu, struct ofono_atom *sim_atom; sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); - if (!sim_atom) + if (sim_atom == NULL) return; if (!__ofono_sim_service_available( @@ -290,7 +290,7 @@ static DBusMessage *cbs_get_properties(DBusConnection *conn, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -386,7 +386,7 @@ static DBusMessage *cbs_set_topics(struct ofono_cbs *cbs, const char *value, if (topics == NULL && value[0] != '\0') return __ofono_error_invalid_format(msg); - if (!cbs->driver->set_topics) + if (cbs->driver->set_topics == NULL) return __ofono_error_not_implemented(msg); cbs->new_topics = topics; @@ -416,7 +416,7 @@ static void cbs_set_powered_cb(const struct ofono_error *error, void *data) if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { ofono_error("Setting Cell Broadcast topics failed"); - if (!cbs->pending) + if (cbs->pending == NULL) return; __ofono_dbus_pending_reply(&cbs->pending, @@ -438,7 +438,7 @@ static void cbs_set_powered_cb(const struct ofono_error *error, void *data) DBUS_TYPE_BOOLEAN, &cbs->powered); - if (!cbs->pending) + if (cbs->pending == NULL) return; reply = dbus_message_new_method_return(cbs->pending); @@ -455,7 +455,7 @@ static DBusMessage *cbs_set_powered(struct ofono_cbs *cbs, gboolean value, if (cbs->powered == value) goto reply; - if (!cbs->driver->set_topics || !cbs->driver->clear_topics) + if (cbs->driver->set_topics == NULL || cbs->driver->clear_topics == NULL) goto done; if (msg) @@ -951,7 +951,7 @@ static void cbs_location_changed(int status, int lac, int ci, int tech, DBG("%d, %d, %d, %d, %s%s", status, lac, ci, tech, mcc, mnc); - if (!mcc || !mnc) { + if (mcc == NULL || mnc == NULL) { if (cbs->mcc[0] == '\0' && cbs->mnc[0] == '\0') return; diff --git a/src/common.c b/src/common.c index f32153c..5154b8d 100644 --- a/src/common.c +++ b/src/common.c @@ -516,7 +516,7 @@ gboolean parse_ss_control_string(char *str, int *ss_type, /* Must have at least one other '#' */ c = strrchr(str+cur, '#'); - if (!c) + if (c == NULL) goto out; *dn = c+1; diff --git a/src/dbus.c b/src/dbus.c index ad29241..2feb2a1 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -176,7 +176,7 @@ int ofono_dbus_signal_property_changed(DBusConnection *conn, signal = dbus_message_new_signal(path, interface, "PropertyChanged"); - if (!signal) { + if (signal == NULL) { ofono_error("Unable to allocate new %s.PropertyChanged signal", interface); return -1; @@ -203,7 +203,7 @@ int ofono_dbus_signal_array_property_changed(DBusConnection *conn, signal = dbus_message_new_signal(path, interface, "PropertyChanged"); - if (!signal) { + if (signal == NULL) { ofono_error("Unable to allocate new %s.PropertyChanged signal", interface); return -1; @@ -230,7 +230,7 @@ int ofono_dbus_signal_dict_property_changed(DBusConnection *conn, signal = dbus_message_new_signal(path, interface, "PropertyChanged"); - if (!signal) { + if (signal == NULL) { ofono_error("Unable to allocate new %s.PropertyChanged signal", interface); return -1; @@ -426,7 +426,7 @@ void __ofono_dbus_cleanup(void) { DBusConnection *conn = ofono_dbus_get_connection(); - if (!conn || !dbus_connection_get_is_connected(conn)) + if (conn == NULL || !dbus_connection_get_is_connected(conn)) return; dbus_gsm_set_connection(NULL); diff --git a/src/gprs.c b/src/gprs.c index 7e42a99..610f3b2 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -336,7 +336,7 @@ static void pri_context_signal_settings(struct pri_context *ctx) OFONO_CONNECTION_CONTEXT_INTERFACE, "PropertyChanged"); - if (!signal) + if (signal == NULL) return; dbus_message_iter_init_append(signal, &iter); @@ -400,7 +400,7 @@ static void pri_ifupdown(const char *interface, ofono_bool_t active) struct ifreq ifr; int sk; - if (!interface) + if (interface == NULL) return; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -436,7 +436,7 @@ static void pri_setaddr(const char *interface, const char *address) struct sockaddr_in addr; int sk; - if (!interface) + if (interface == NULL) return; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -459,7 +459,7 @@ static void pri_setaddr(const char *interface, const char *address) goto done; } - if (!address) + if (address == NULL) goto done; memset(&addr, 0, sizeof(addr)); @@ -480,7 +480,7 @@ static void pri_setproxy(const char *interface, const char *proxy) struct sockaddr_in addr; int sk; - if (!interface) + if (interface == NULL) return; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -550,7 +550,7 @@ static void pri_update_context_settings(struct pri_context *ctx, context_settings_free(ctx->settings); ctx->settings = g_try_new0(struct context_settings, 1); - if (!ctx->settings) + if (ctx->settings == NULL) return; ctx->settings->type = ctx->type; @@ -633,7 +633,7 @@ static DBusMessage *pri_get_properties(DBusConnection *conn, DBusMessageIter dict; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -1147,12 +1147,12 @@ static struct pri_context *pri_context_create(struct ofono_gprs *gprs, { struct pri_context *context = g_try_new0(struct pri_context, 1); - if (!context) + if (context == NULL) return NULL; - if (!name) { + if (name == NULL) { name = gprs_context_default_name(type); - if (!name) + if (name == NULL) return NULL; } @@ -1419,7 +1419,7 @@ static DBusMessage *gprs_get_properties(DBusConnection *conn, dbus_bool_t value; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -1497,7 +1497,7 @@ static DBusMessage *gprs_set_property(DBusConnection *conn, gprs_netreg_update(gprs); } else if (!strcmp(property, "Powered")) { - if (!gprs->driver->set_attached) + if (gprs->driver->set_attached == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN) @@ -1563,7 +1563,7 @@ static struct pri_context *add_context(struct ofono_gprs *gprs, return NULL; context = pri_context_create(gprs, name, type); - if (!context) { + if (context == NULL) { ofono_error("Unable to allocate context struct"); return NULL; } @@ -1709,7 +1709,7 @@ static DBusMessage *gprs_remove_context(DBusConnection *conn, return __ofono_error_invalid_format(msg); ctx = gprs_context_by_path(gprs, path); - if (!ctx) + if (ctx == NULL) return __ofono_error_not_found(msg); if (ctx->active) { diff --git a/src/history.c b/src/history.c index 7d3c927..e745820 100644 --- a/src/history.c +++ b/src/history.c @@ -106,7 +106,7 @@ void __ofono_history_probe_drivers(struct ofono_modem *modem) context = history_context_create(modem, driver); - if (!context) + if (context == NULL) continue; __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_HISTORY, diff --git a/src/main.c b/src/main.c index eca008e..87fb0ab 100644 --- a/src/main.c +++ b/src/main.c @@ -214,7 +214,7 @@ int main(int argc, char **argv) dbus_error_init(&error); conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OFONO_SERVICE, &error); - if (!conn) { + if (conn == NULL) { if (dbus_error_is_set(&error) == TRUE) { ofono_error("Unable to hop onto D-Bus: %s", error.message); diff --git a/src/message-waiting.c b/src/message-waiting.c index 97a238c..d8bfe34 100644 --- a/src/message-waiting.c +++ b/src/message-waiting.c @@ -119,7 +119,7 @@ static DBusMessage *mw_get_properties(DBusConnection *conn, const char *number; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -395,7 +395,7 @@ static void update_indicator_and_emit(struct ofono_message_waiting *mw, indication = info->indication; count = info->message_count; - if (!mw_message_waiting_property_name[mailbox]) + if (mw_message_waiting_property_name[mailbox] == NULL) return; ofono_dbus_signal_property_changed(conn, path, diff --git a/src/modem.c b/src/modem.c index f032d93..52e647b 100644 --- a/src/modem.c +++ b/src/modem.c @@ -532,7 +532,7 @@ static DBusMessage *set_property_online(struct ofono_modem *modem, if (modem->pending != NULL) return __ofono_error_busy(msg); - if (!driver->set_online) + if (driver->set_online == NULL) return __ofono_error_not_implemented(msg); if (modem->modem_state < MODEM_STATE_OFFLINE) @@ -628,7 +628,7 @@ static DBusMessage *modem_get_properties(DBusConnection *conn, DBusMessageIter dict; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -947,7 +947,7 @@ void ofono_modem_remove_interface(struct ofono_modem *modem, found = g_slist_find_custom(modem->interface_list, interface, (GCompareFunc) strcmp); - if (!found) { + if (found == NULL) { ofono_error("Interface %s not found on the interface_list", interface); return; @@ -994,7 +994,7 @@ static void query_serial_cb(const struct ofono_error *error, static void query_serial(struct ofono_devinfo *info) { - if (!info->driver->query_serial) + if (info->driver->query_serial == NULL) return; info->driver->query_serial(info, query_serial_cb, info); @@ -1023,7 +1023,7 @@ out: static void query_revision(struct ofono_devinfo *info) { - if (!info->driver->query_revision) { + if (info->driver->query_revision == NULL) { query_serial(info); return; } @@ -1054,7 +1054,7 @@ out: static void query_model(struct ofono_devinfo *info) { - if (!info->driver->query_model) { + if (info->driver->query_model == NULL) { /* If model is not supported, don't bother querying revision */ query_serial(info); } @@ -1088,7 +1088,7 @@ static gboolean query_manufacturer(gpointer user) { struct ofono_devinfo *info = user; - if (!info->driver->query_manufacturer) { + if (info->driver->query_manufacturer == NULL) { query_model(info); return FALSE; } diff --git a/src/nettime.c b/src/nettime.c index 904deee..3821c16 100644 --- a/src/nettime.c +++ b/src/nettime.c @@ -78,7 +78,7 @@ void __ofono_nettime_probe_drivers(struct ofono_modem *modem) context = nettime_context_create(modem, driver); - if (!context) + if (context == NULL) continue; __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_NETTIME, diff --git a/src/network.c b/src/network.c index 83014bb..e391bc3 100644 --- a/src/network.c +++ b/src/network.c @@ -194,7 +194,7 @@ static void register_callback(const struct ofono_error *error, void *data) DBusConnection *conn = ofono_dbus_get_connection(); DBusMessage *reply; - if (!netreg->pending) + if (netreg->pending == NULL) goto out; if (error->type == OFONO_ERROR_TYPE_NO_ERROR) @@ -352,7 +352,7 @@ static char *get_operator_display_name(struct ofono_netreg *netreg) * together there are four cases to consider. */ - if (!opd) { + if (opd == NULL) { g_strlcpy(name, "", len); return name; } @@ -371,7 +371,7 @@ static char *get_operator_display_name(struct ofono_netreg *netreg) if (opd->eons_info && opd->eons_info->longname) plmn = opd->eons_info->longname; - if (!netreg->spname || strlen(netreg->spname) == 0) { + if (netreg->spname == NULL || strlen(netreg->spname) == 0) { g_strlcpy(name, plmn, len); return name; } @@ -458,7 +458,7 @@ static void set_network_operator_eons_info(struct network_operator_data *opd, const char *oldinfo; const char *newinfo; - if (!old_eons_info && !eons_info) + if (old_eons_info == NULL && eons_info == NULL) return; path = network_operator_build_path(netreg, opd->mcc, opd->mnc); @@ -566,7 +566,7 @@ static DBusMessage *network_operator_get_properties(DBusConnection *conn, DBusMessageIter iter; DBusMessageIter dict; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -671,7 +671,7 @@ static GSList *compress_operator_list(const struct ofono_network_operator *list, o = g_slist_find_custom(oplist, &list[i], network_operator_compare); - if (!o) { + if (o == NULL) { opd = network_operator_create(&list[i]); oplist = g_slist_prepend(oplist, opd); } else if (o && list[i].tech != -1) { @@ -760,7 +760,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn, const char *mode = registration_mode_to_string(netreg->mode); reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -1217,7 +1217,7 @@ static void current_operator_callback(const struct ofono_error *error, return; } - if (!netreg->current_operator && !current) + if (netreg->current_operator == NULL && current == NULL) return; /* We got a new network operator, reset the previous one's status */ @@ -1299,7 +1299,7 @@ emit: void ofono_netreg_status_notify(struct ofono_netreg *netreg, int status, int lac, int ci, int tech) { - if (!netreg) + if (netreg == NULL) return; if (netreg->status != status) @@ -1339,7 +1339,7 @@ void ofono_netreg_time_notify(struct ofono_netreg *netreg, { struct ofono_modem *modem = __ofono_atom_get_modem(netreg->atom); - if (!info) + if (info == NULL) return; __ofono_nettime_info_received(modem, info); @@ -1465,7 +1465,7 @@ static void sim_pnn_read_cb(int ok, int length, int record, total = length / record_length; - if (!netreg->eons) + if (netreg->eons == NULL) netreg->eons = sim_eons_new(total); sim_eons_add_pnn_record(netreg->eons, record, data, record_length); @@ -1498,7 +1498,7 @@ static void sim_spdi_read_cb(int ok, int length, int record, netreg->spdi = sim_spdi_new(data, length); - if (!current) + if (current == NULL) return; if (netreg->status == NETWORK_REGISTRATION_STATUS_ROAMING) { @@ -1550,7 +1550,7 @@ static void sim_spn_read_cb(int ok, int length, int record, */ spn = sim_string_to_utf8(data + 1, length - 1); - if (!spn) { + if (spn == NULL) { ofono_error("EFspn read successfully, but couldn't parse"); return; } @@ -1773,7 +1773,7 @@ static void netreg_load_settings(struct ofono_netreg *netreg) imsi = ofono_sim_get_imsi(netreg->sim); - if (!imsi) + if (imsi == NULL) return; netreg->settings = storage_open(imsi, SETTINGS_STORE); diff --git a/src/phonebook.c b/src/phonebook.c index cae2b14..0e9c894 100644 --- a/src/phonebook.c +++ b/src/phonebook.c @@ -155,7 +155,7 @@ static void vcard_printf_number(GString *vcards, const char *number, int type, char *pref = "", *intl = "", *category_string = ""; char buf[128]; - if (!number || !strlen(number) || !type) + if (number == NULL || !strlen(number) || !type) return; switch (category) { @@ -278,7 +278,7 @@ static DBusMessage *generate_export_entries_reply(struct ofono_phonebook *pb, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -292,7 +292,7 @@ static gboolean need_merge(const char *text) int len; char c; - if (!text) + if (text == NULL) return FALSE; len = strlen(text); @@ -375,7 +375,7 @@ void ofono_phonebook_entry(struct ofono_phonebook *phonebook, int index, break; } - if (!l) { + if (l == NULL) { person = g_new0(struct phonebook_person, 1); phonebook->merge_list = g_slist_prepend(phonebook->merge_list, person); @@ -445,7 +445,7 @@ static void export_phonebook(struct ofono_phonebook *phonebook) reply = generate_export_entries_reply(phonebook, phonebook->pending); - if (!reply) { + if (reply == NULL) { dbus_message_unref(phonebook->pending); return; } diff --git a/src/plugin.c b/src/plugin.c index 7c0652b..25e9a5a 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -88,7 +88,7 @@ static gboolean check_plugin(struct ofono_plugin_desc *desc, for (; *patterns; patterns++) if (g_pattern_match_simple(*patterns, desc->name)) break; - if (!*patterns) { + if (*patterns == NULL) { ofono_info("Ignoring %s", desc->description); return FALSE; } diff --git a/src/radio-settings.c b/src/radio-settings.c index 5794221..ff6934b 100644 --- a/src/radio-settings.c +++ b/src/radio-settings.c @@ -96,7 +96,7 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg, const char *mode = radio_access_mode_to_string(rs->mode); reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -233,7 +233,7 @@ static void radio_fast_dormancy_query_callback(const struct ofono_error *error, static void radio_query_fast_dormancy(struct ofono_radio_settings *rs) { - if (!rs->driver->query_fast_dormancy) { + if (rs->driver->query_fast_dormancy == NULL) { radio_send_properties_reply(rs); return; } @@ -270,7 +270,7 @@ static DBusMessage *radio_get_properties(DBusConnection *conn, if (rs->flags & RADIO_SETTINGS_FLAG_CACHED) return radio_get_properties_reply(msg, rs); - if (!rs->driver->query_rat_mode) + if (rs->driver->query_rat_mode == NULL) return __ofono_error_not_implemented(msg); if (rs->pending) @@ -311,7 +311,7 @@ static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg, const char *value; enum ofono_radio_access_mode mode; - if (!rs->driver->set_rat_mode) + if (rs->driver->set_rat_mode == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_STRING) @@ -334,7 +334,7 @@ static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg, dbus_bool_t value; int target; - if (!rs->driver->set_fast_dormancy) + if (rs->driver->set_fast_dormancy == NULL) return __ofono_error_not_implemented(msg); if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN) @@ -374,7 +374,7 @@ int ofono_radio_settings_driver_register(const struct ofono_radio_settings_drive { DBG("driver: %p, name: %s", d, d->name); - if (!d || !d->probe) + if (d == NULL || d->probe == NULL) return -EINVAL; g_drivers = g_slist_prepend(g_drivers, (void *) d); @@ -386,7 +386,7 @@ void ofono_radio_settings_driver_unregister(const struct ofono_radio_settings_dr { DBG("driver: %p, name: %s", d, d->name); - if (!d) + if (d == NULL) return; g_drivers = g_slist_remove(g_drivers, (void *) d); @@ -409,7 +409,7 @@ static void radio_settings_remove(struct ofono_atom *atom) DBG("atom: %p", atom); - if (!rs) + if (rs == NULL) return; if (rs->driver && rs->driver->remove) @@ -426,11 +426,11 @@ struct ofono_radio_settings *ofono_radio_settings_create(struct ofono_modem *mod struct ofono_radio_settings *rs; GSList *l; - if (!driver) + if (driver == NULL) return NULL; rs = g_try_new0(struct ofono_radio_settings, 1); - if (!rs) + if (rs == NULL) return NULL; rs->mode = -1; diff --git a/src/sim.c b/src/sim.c index bc7859c..860f179 100644 --- a/src/sim.c +++ b/src/sim.c @@ -292,7 +292,7 @@ static DBusMessage *sim_get_properties(DBusConnection *conn, dbus_bool_t bdn; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -582,7 +582,7 @@ static DBusMessage *sim_lock_or_unlock(struct ofono_sim *sim, int lock, const char *typestr; const char *pin; - if (!sim->driver->lock) + if (sim->driver->lock == NULL) return __ofono_error_not_implemented(msg); if (sim->pending) @@ -653,7 +653,7 @@ static DBusMessage *sim_change_pin(DBusConnection *conn, DBusMessage *msg, const char *old; const char *new; - if (!sim->driver->change_passwd) + if (sim->driver->change_passwd == NULL) return __ofono_error_not_implemented(msg); if (sim->pending) @@ -709,7 +709,7 @@ static DBusMessage *sim_enter_pin(DBusConnection *conn, DBusMessage *msg, enum ofono_sim_password_type type; const char *pin; - if (!sim->driver->send_passwd) + if (sim->driver->send_passwd == NULL) return __ofono_error_not_implemented(msg); if (sim->pending) @@ -918,7 +918,7 @@ static DBusMessage *sim_reset_pin(DBusConnection *conn, DBusMessage *msg, const char *puk; const char *pin; - if (!sim->driver->reset_passwd) + if (sim->driver->reset_passwd == NULL) return __ofono_error_not_implemented(msg); if (sim->pending) @@ -976,7 +976,7 @@ static gboolean numbers_list_equal(GSList *a, GSList *b) struct ofono_phone_number *num_a, *num_b; while (a || b) { - if (!a || !b) + if (a == NULL || b == NULL) return FALSE; num_a = a->data; @@ -1242,7 +1242,7 @@ static void sim_imsi_cb(const struct ofono_error *error, const char *imsi, static void sim_retrieve_imsi(struct ofono_sim *sim) { - if (!sim->driver->read_imsi) { + if (sim->driver->read_imsi == NULL) { ofono_error("IMSI retrieval not implemented," " only emergency calls will be available"); return; @@ -1592,7 +1592,7 @@ checkdone: static void sim_pin_check(struct ofono_sim *sim) { - if (!sim->driver->query_passwd_state) { + if (sim->driver->query_passwd_state == NULL) { sim_initialize_after_pin(sim); return; } diff --git a/src/simfs.c b/src/simfs.c index 5f459ab..8e52f7b 100644 --- a/src/simfs.c +++ b/src/simfs.c @@ -408,7 +408,7 @@ static gboolean sim_fs_op_read_record(gpointer user) switch (op->structure) { case OFONO_SIM_FILE_STRUCTURE_FIXED: - if (!driver->read_file_linear) { + if (driver->read_file_linear == NULL) { sim_fs_op_error(fs); return FALSE; } @@ -418,7 +418,7 @@ static gboolean sim_fs_op_read_record(gpointer user) sim_fs_op_retrieve_cb, fs); break; case OFONO_SIM_FILE_STRUCTURE_CYCLIC: - if (!driver->read_file_cyclic) { + if (driver->read_file_cyclic == NULL) { sim_fs_op_error(fs); return FALSE; } @@ -626,7 +626,7 @@ static gboolean sim_fs_op_next(gpointer user_data) fs->op_source = 0; - if (!fs->op_q) + if (fs->op_q == NULL) return FALSE; op = g_queue_peek_head(fs->op_q); @@ -671,16 +671,16 @@ int sim_fs_read_info(struct sim_fs *fs, int id, { struct sim_fs_op *op; - if (!cb) + if (cb == NULL) return -EINVAL; - if (!fs->driver) + if (fs->driver == NULL) return -EINVAL; - if (!fs->driver->read_file_info) + if (fs->driver->read_file_info == NULL) return -ENOSYS; - if (!fs->op_q) + if (fs->op_q == NULL) fs->op_q = g_queue_new(); op = g_try_new0(struct sim_fs_op, 1); @@ -709,16 +709,16 @@ int sim_fs_read(struct sim_fs *fs, int id, { struct sim_fs_op *op; - if (!cb) + if (cb == NULL) return -EINVAL; - if (!fs->driver) + if (fs->driver == NULL) return -EINVAL; - if (!fs->driver->read_file_info) + if (fs->driver->read_file_info == NULL) return -ENOSYS; - if (!fs->op_q) + if (fs->op_q == NULL) fs->op_q = g_queue_new(); op = g_try_new0(struct sim_fs_op, 1); @@ -749,10 +749,10 @@ int sim_fs_write(struct sim_fs *fs, int id, ofono_sim_file_write_cb_t cb, struct sim_fs_op *op; gconstpointer fn = NULL; - if (!cb) + if (cb == NULL) return -EINVAL; - if (!fs->driver) + if (fs->driver == NULL) return -EINVAL; switch (structure) { @@ -772,7 +772,7 @@ int sim_fs_write(struct sim_fs *fs, int id, ofono_sim_file_write_cb_t cb, if (fn == NULL) return -ENOSYS; - if (!fs->op_q) + if (fs->op_q == NULL) fs->op_q = g_queue_new(); op = g_try_new0(struct sim_fs_op, 1); diff --git a/src/simutil.c b/src/simutil.c index 58ea81d..b9a8bbb 100644 --- a/src/simutil.c +++ b/src/simutil.c @@ -939,7 +939,7 @@ struct sim_spdi *sim_spdi_new(const guint8 *tlv, int length) plmn_list = ber_tlv_find_by_tag(plmn_list_tlv, 0x80, tlv_length, &list_length); - if (!plmn_list) + if (plmn_list == NULL) return NULL; spdi = g_new0(struct sim_spdi, 1); @@ -963,7 +963,7 @@ gboolean sim_spdi_lookup(struct sim_spdi *spdi, { struct spdi_operator spdi_op; - if (!spdi) + if (spdi == NULL) return FALSE; g_strlcpy(spdi_op.mcc, mcc, sizeof(spdi_op.mcc)); @@ -1011,7 +1011,7 @@ void sim_eons_add_pnn_record(struct sim_eons *eons, int record, name = ber_tlv_find_by_tag(tlv, 0x43, length, &namelength); - if (!name || !namelength) + if (name == NULL || !namelength) return; oper->longname = sim_network_name_parse(name, namelength, @@ -1119,7 +1119,7 @@ static const struct sim_eons_operator_info * break; } - if (!l) + if (l == NULL) return NULL; opl = l->data; @@ -1316,7 +1316,7 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len, */ tlv = ber_tlv_find_by_tag(fcp, 0x80, fcp_length, &tlv_length); - if (!tlv || tlv_length < 2) + if (tlv == NULL || tlv_length < 2) return FALSE; flen = tlv[0]; @@ -1325,14 +1325,14 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len, tlv = ber_tlv_find_by_tag(fcp, 0x83, fcp_length, &tlv_length); - if (!tlv || tlv_length != 2) + if (tlv == NULL || tlv_length != 2) return FALSE; id = (tlv[0] << 8) | tlv[1]; tlv = ber_tlv_find_by_tag(fcp, 0x82, fcp_length, &tlv_length); - if (!tlv || (tlv_length != 2 && tlv_length != 5)) + if (tlv == NULL || (tlv_length != 2 && tlv_length != 5)) return FALSE; if (tlv[1] != 0x21) @@ -1381,7 +1381,7 @@ gboolean sim_parse_3g_get_response(const unsigned char *data, int len, acc[2] = 0x44; - if (!info) + if (info == NULL) acc[0] = 0x11; else acc[0] = (info->perm_read << 4) | info->perm_update; diff --git a/src/sms.c b/src/sms.c index 12988c8..17e6640 100644 --- a/src/sms.c +++ b/src/sms.c @@ -191,11 +191,11 @@ static unsigned int add_sms_handler(struct ofono_watchlist *watchlist, { struct sms_handler *handler; - if (!notify) + if (notify == NULL) return 0; handler = g_try_new0(struct sms_handler, 1); - if (!handler) + if (handler == NULL) return 0; handler->dst = dst; @@ -212,7 +212,7 @@ unsigned int __ofono_sms_text_watch_add(struct ofono_sms *sms, ofono_sms_text_notify_cb_t cb, void *data, ofono_destroy_func destroy) { - if (!sms) + if (sms == NULL) return 0; DBG("%p", sms); @@ -223,7 +223,7 @@ unsigned int __ofono_sms_text_watch_add(struct ofono_sms *sms, gboolean __ofono_sms_text_watch_remove(struct ofono_sms *sms, unsigned int id) { - if (!sms) + if (sms == NULL) return FALSE; DBG("%p", sms); @@ -236,7 +236,7 @@ unsigned int __ofono_sms_datagram_watch_add(struct ofono_sms *sms, int dst, int src, void *data, ofono_destroy_func destroy) { - if (!sms) + if (sms == NULL) return 0; DBG("%p: dst %d, src %d", sms, dst, src); @@ -248,7 +248,7 @@ unsigned int __ofono_sms_datagram_watch_add(struct ofono_sms *sms, gboolean __ofono_sms_datagram_watch_remove(struct ofono_sms *sms, unsigned int id) { - if (!sms) + if (sms == NULL) return FALSE; DBG("%p", sms); @@ -266,7 +266,7 @@ static DBusMessage *message_get_properties(DBusConnection *conn, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -330,7 +330,7 @@ static gboolean message_dbus_register(struct ofono_sms *sms, struct message *m) DBusConnection *conn = ofono_dbus_get_connection(); const char *path; - if (!m) + if (m == NULL) return FALSE; path = __ofono_sms_message_path_from_uuid(sms, &m->uuid); @@ -487,7 +487,7 @@ static DBusMessage *generate_get_properties_reply(struct ofono_sms *sms, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -541,7 +541,7 @@ static DBusMessage *sms_get_properties(DBusConnection *conn, if (sms->pending) return __ofono_error_busy(msg); - if (!sms->driver->sca_query) + if (sms->driver->sca_query == NULL) return __ofono_error_not_implemented(msg); if (sms->flags & MESSAGE_MANAGER_FLAG_CACHED) @@ -832,7 +832,7 @@ static gboolean tx_next(gpointer user_data) sms->tx_source = 0; - if (!entry) + if (entry == NULL) return FALSE; if (g_queue_get_length(sms->txq) > 1 @@ -991,7 +991,7 @@ static DBusMessage *sms_send_message(DBusConnection *conn, DBusMessage *msg, msg_list = sms_text_prepare(to, text, sms->ref, use_16bit_ref, sms->use_delivery_reports); - if (!msg_list) + if (msg_list == NULL) return __ofono_error_invalid_format(msg); flags = OFONO_SMS_SUBMIT_FLAG_RECORD_HISTORY; @@ -1175,7 +1175,7 @@ static void dispatch_text_message(struct ofono_sms *sms, struct sms_handler *h; GSList *l; - if (!message) + if (message == NULL) return; if (cls == SMS_CLASS_0) @@ -1186,7 +1186,7 @@ static void dispatch_text_message(struct ofono_sms *sms, signal = dbus_message_new_signal(path, OFONO_MESSAGE_MANAGER_INTERFACE, signal_name); - if (!signal) + if (signal == NULL) return; dbus_message_iter_init_append(signal, &iter); @@ -1325,7 +1325,7 @@ static void sms_dispatch(struct ofono_sms *sms, GSList *sms_list) buf = sms_decode_datagram(sms_list, &len); - if (!buf) + if (buf == NULL) return; dispatch_app_datagram(sms, &uuid, dstport, srcport, buf, len, @@ -1335,7 +1335,7 @@ static void sms_dispatch(struct ofono_sms *sms, GSList *sms_list) } else { char *message = sms_decode_text(sms_list); - if (!message) + if (message == NULL) return; dispatch_text_message(sms, &uuid, message, cls, @@ -1357,7 +1357,7 @@ static void handle_deliver(struct ofono_sms *sms, const struct sms *incoming) if (sms_extract_concatenation(incoming, &ref, &max, &seq)) { GSList *sms_list; - if (!sms->assembly) + if (sms->assembly == NULL) return; sms_list = sms_assembly_add_fragment(sms->assembly, @@ -1365,7 +1365,7 @@ static void handle_deliver(struct ofono_sms *sms, const struct sms *incoming) &incoming->deliver.oaddr, ref, max, seq); - if (!sms_list) + if (sms_list == NULL) return; sms_dispatch(sms, sms_list); @@ -1489,7 +1489,7 @@ void ofono_sms_deliver_notify(struct ofono_sms *sms, unsigned char *pdu, sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); - if (!sim_atom) + if (sim_atom == NULL) return; if (!__ofono_sim_service_available( @@ -1500,7 +1500,7 @@ void ofono_sms_deliver_notify(struct ofono_sms *sms, unsigned char *pdu, stk_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_STK); - if (!stk_atom) + if (stk_atom == NULL) return; __ofono_sms_sim_download(__ofono_atom_get_data(stk_atom), diff --git a/src/smsagent.c b/src/smsagent.c index bb0a3ab..9d6f21d 100644 --- a/src/smsagent.c +++ b/src/smsagent.c @@ -63,7 +63,7 @@ static struct sms_agent_request *sms_agent_request_new(struct sms_agent *agent, struct sms_agent_request *req; req = g_try_new0(struct sms_agent_request, 1); - if (!req) + if (req == NULL) return NULL; req->agent = agent; @@ -99,7 +99,7 @@ static void sms_agent_send_noreply(struct sms_agent *agent, const char *method) message = dbus_message_new_method_call(agent->service, agent->path, agent->interface, method); - if (!message) + if (message == NULL) return; dbus_message_set_no_reply(message, TRUE); @@ -130,7 +130,7 @@ struct sms_agent *sms_agent_new(const char *interface, struct sms_agent *agent = g_try_new0(struct sms_agent, 1); DBusConnection *conn = ofono_dbus_get_connection(); - if (!agent) + if (agent == NULL) return NULL; agent->interface = g_strdup(interface); @@ -164,7 +164,7 @@ void sms_agent_free(struct sms_agent *agent) { DBusConnection *conn = ofono_dbus_get_connection(); - if (!agent) + if (agent == NULL) return; if (agent->disconnect_watch) { @@ -266,12 +266,12 @@ int sms_agent_dispatch_datagram(struct sms_agent *agent, const char *method, const char *str = buf; req = sms_agent_request_new(agent, cb, user_data, destroy); - if (!req) + if (req == NULL) return -ENOMEM; req->msg = dbus_message_new_method_call(agent->service, agent->path, agent->interface, method); - if (!req->msg) { + if (req->msg == NULL) { sms_agent_request_free(req); return -ENOMEM; } diff --git a/src/smsutil.c b/src/smsutil.c index e6dbf5f..41169d9 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -526,7 +526,7 @@ gboolean sms_encode_address_field(const struct sms_address *in, gboolean sc, gsm = convert_utf8_to_gsm(in->address, len, NULL, &written, 0); - if (!gsm) + if (gsm == NULL) return FALSE; r = pack_7bit_own_buf(gsm, written, 0, FALSE, &packed, 0, p); @@ -641,14 +641,14 @@ gboolean sms_decode_address_field(const unsigned char *pdu, int len, *offset = *offset + (addr_len + 1) / 2; - if (!res) + if (res == NULL) return FALSE; utf8 = convert_gsm_to_utf8(res, written, NULL, NULL, 0); g_free(res); - if (!utf8) + if (utf8 == NULL) return FALSE; if (strlen(utf8) > 20) { @@ -1504,7 +1504,7 @@ gboolean sms_decode(const unsigned char *pdu, int len, gboolean outgoing, unsigned char type; int offset = 0; - if (!out) + if (out == NULL) return FALSE; if (len == 0) @@ -1617,7 +1617,7 @@ const guint8 *sms_extract_common(const struct sms *sms, gboolean *out_udhi, break; }; - if (!ud) + if (ud == NULL) return NULL; if (out_udhi) @@ -1683,7 +1683,7 @@ gboolean sms_udh_iter_init(const struct sms *sms, struct sms_udh_iter *iter) hdr = sms_extract_common(sms, &udhi, &dcs, &udl, &max_ud_len); - if (!hdr) + if (hdr == NULL) return FALSE; if (!udhi) @@ -2123,7 +2123,7 @@ unsigned char *sms_decode_datagram(GSList *sms_list, long *out_len) ud = sms_extract_common(sms, NULL, NULL, &udl, NULL); - if (!ud) + if (ud == NULL) return NULL; /* @@ -2142,7 +2142,7 @@ unsigned char *sms_decode_datagram(GSList *sms_list, long *out_len) buf = g_try_new(unsigned char, len); - if (!buf) + if (buf == NULL) return NULL; len = 0; @@ -2417,7 +2417,7 @@ static gboolean sms_assembly_store(struct sms_assembly *assembly, int len; DECLARE_SMS_ADDR_STR(straddr); - if (!assembly->imsi) + if (assembly->imsi == NULL) return FALSE; if (sms_address_to_hex_string(&node->addr, straddr) == FALSE) @@ -2440,7 +2440,7 @@ static void sms_assembly_backup_free(struct sms_assembly *assembly, int seq; DECLARE_SMS_ADDR_STR(straddr); - if (!assembly->imsi) + if (assembly->imsi == NULL) return; if (sms_address_to_hex_string(&node->addr, straddr) == FALSE) @@ -2800,7 +2800,7 @@ static gboolean sr_assembly_add_fragment_backup(const char *imsi, DECLARE_SMS_ADDR_STR(straddr); char msgid_str[SMS_MSGID_LEN * 2 + 1]; - if (!imsi) + if (imsi == NULL) return FALSE; if (sms_address_to_hex_string(addr, straddr) == FALSE) @@ -2826,7 +2826,7 @@ static gboolean sr_assembly_remove_fragment_backup(const char *imsi, DECLARE_SMS_ADDR_STR(straddr); char msgid_str[SMS_MSGID_LEN * 2 + 1]; - if (!imsi) + if (imsi == NULL) return FALSE; if (sms_address_to_hex_string(addr, straddr) == FALSE) @@ -3297,7 +3297,7 @@ GSList *sms_text_prepare(const char *to, const char *utf8, guint16 ref, /* UDHI, UDL, UD and DCS actually depend on what we have in the text */ gsm_encoded = convert_utf8_to_gsm(utf8, -1, NULL, &written, 0); - if (!gsm_encoded) { + if (gsm_encoded == NULL) { gsize converted; ucs2_encoded = g_convert(utf8, -1, "UCS-2BE//TRANSLIT", "UTF-8", @@ -3305,7 +3305,7 @@ GSList *sms_text_prepare(const char *to, const char *utf8, guint16 ref, written = converted; } - if (!gsm_encoded && !ucs2_encoded) + if (gsm_encoded == NULL && ucs2_encoded == NULL) return NULL; if (gsm_encoded) @@ -4370,7 +4370,7 @@ static gint cbs_topic_compare(gconstpointer a, gconstpointer b) gboolean cbs_topic_in_range(unsigned int topic, GSList *ranges) { - if (!ranges) + if (ranges == NULL) return FALSE; return g_slist_find_custom(ranges, GUINT_TO_POINTER(topic), @@ -4427,11 +4427,11 @@ gboolean ussd_encode(const char *str, long *items_written, unsigned char *pdu) long written; long num_packed; - if (!pdu) + if (pdu == NULL) return FALSE; converted = convert_utf8_to_gsm(str, -1, NULL, &written, 0); - if (!converted || written > 182) { + if (converted == NULL || written > 182) { g_free(converted); return FALSE; } diff --git a/src/stk.c b/src/stk.c index 88b162c..a4abb7d 100644 --- a/src/stk.c +++ b/src/stk.c @@ -116,7 +116,7 @@ static int stk_respond(struct ofono_stk *stk, struct stk_response *rsp, rsp->qualifier = stk->pending_cmd->qualifier; tlv = stk_pdu_from_response(rsp, &tlv_len); - if (!tlv) + if (tlv == NULL) return -EINVAL; stk_command_free(stk->pending_cmd); @@ -208,7 +208,7 @@ static int stk_send_envelope(struct ofono_stk *stk, struct stk_envelope *e, e->dst = STK_DEVICE_IDENTITY_TYPE_UICC; tlv = stk_pdu_from_envelope(e, &tlv_len); - if (!tlv) + if (tlv == NULL) return -EINVAL; op = g_new0(struct envelope_op, 1); @@ -342,7 +342,7 @@ static struct stk_menu *stk_menu_create(const char *title, ret->title = dbus_apply_text_attributes(title ? title : "", title_attr); - if (!ret->title) + if (ret->title == NULL) ret->title = g_strdup(title ? title : ""); memcpy(&ret->icon, icon, sizeof(ret->icon)); @@ -366,7 +366,7 @@ static struct stk_menu *stk_menu_create(const char *title, text = dbus_apply_text_attributes(item->text, &attr); } - if (!text) + if (text == NULL) text = strdup(item->text); ret->items[i].text = text; @@ -451,7 +451,7 @@ static void emit_menu_changed(struct ofono_stk *stk) signal = dbus_message_new_signal(path, OFONO_STK_INTERFACE, "PropertyChanged"); - if (!signal) { + if (signal == NULL) { ofono_error("Unable to allocate new %s.PropertyChanged signal", OFONO_SIM_APP_INTERFACE); @@ -510,7 +510,7 @@ static DBusMessage *stk_get_properties(DBusConnection *conn, unsigned char icon; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -632,13 +632,13 @@ static DBusMessage *stk_register_agent(DBusConnection *conn, stk->default_agent = stk_agent_new(agent_path, dbus_message_get_sender(msg), FALSE); - if (!stk->default_agent) + if (stk->default_agent == NULL) return __ofono_error_failed(msg); stk_agent_set_removed_notify(stk->default_agent, default_agent_notify, stk); - if (!stk->session_agent) + if (stk->session_agent == NULL) stk->current_agent = stk->default_agent; return dbus_message_new_method_return(msg); @@ -656,7 +656,7 @@ static DBusMessage *stk_unregister_agent(DBusConnection *conn, DBUS_TYPE_INVALID) == FALSE) return __ofono_error_invalid_args(msg); - if (!stk->default_agent) + if (stk->default_agent == NULL) return __ofono_error_failed(msg); if (!stk_agent_matches(stk->default_agent, agent_path, agent_bus)) @@ -698,7 +698,7 @@ static void menu_selection_envelope_cb(struct ofono_stk *stk, gboolean ok, stk->session_agent = stk_agent_new(agent_path, dbus_message_get_sender(stk->pending), TRUE); - if (!stk->session_agent) { + if (stk->session_agent == NULL) { reply = __ofono_error_failed(stk->pending); goto out; @@ -729,7 +729,7 @@ static DBusMessage *stk_select_item(DBusConnection *conn, if (stk->pending || stk->session_agent) return __ofono_error_busy(msg); - if (!menu) + if (menu == NULL) return __ofono_error_not_supported(msg); if (dbus_message_get_args(msg, NULL, @@ -838,7 +838,7 @@ static gboolean handle_command_send_sms(const struct stk_command *cmd, sms_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SMS); - if (!sms_atom || !__ofono_atom_get_registered(sms_atom)) { + if (sms_atom == NULL || !__ofono_atom_get_registered(sms_atom)) { rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE; return TRUE; } @@ -879,7 +879,7 @@ static gboolean handle_command_set_idle_text(const struct stk_command *cmd, cmd->setup_idle_mode_text.text, &cmd->setup_idle_mode_text.text_attr); - if (!idle_mode_text) { + if (idle_mode_text == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -1168,7 +1168,7 @@ static gboolean handle_command_select_item(const struct stk_command *cmd, { stk->select_item_menu = stk_menu_create_from_select_item(cmd); - if (!stk->select_item_menu) { + if (stk->select_item_menu == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; @@ -1268,7 +1268,7 @@ static gboolean handle_command_display_text(const struct stk_command *cmd, char *text = dbus_apply_text_attributes(dt->text, &dt->text_attr); int err; - if (!text) { + if (text == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -1430,7 +1430,7 @@ static gboolean handle_command_get_inkey(const struct stk_command *cmd, */ int err; - if (!text) { + if (text == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -1523,7 +1523,7 @@ static gboolean handle_command_get_input(const struct stk_command *cmd, gboolean hidden = (qualifier & (1 << 2)) != 0; int err; - if (!text) { + if (text == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -1567,7 +1567,7 @@ static void call_setup_connected(struct ofono_call *call, void *data) static struct ofono_error error = { .type = OFONO_ERROR_TYPE_FAILURE }; static unsigned char facility_rejected_result[] = { 0x9d }; - if (!call || call->status == CALL_STATUS_DISCONNECTED) { + if (call == NULL || call->status == CALL_STATUS_DISCONNECTED) { memset(&rsp, 0, sizeof(rsp)); rsp.result.type = STK_RESULT_TYPE_NETWORK_UNAVAILABLE; @@ -1593,7 +1593,7 @@ static void call_setup_cancel(struct ofono_stk *stk) vc_atom = __ofono_modem_find_atom(__ofono_atom_get_modem(stk->atom), OFONO_ATOM_TYPE_VOICECALL); - if (!vc_atom) + if (vc_atom == NULL) return; vc = __ofono_atom_get_data(vc_atom); @@ -1641,7 +1641,7 @@ static void confirm_call_cb(enum stk_agent_result result, gboolean confirm, if (vc_atom) vc = __ofono_atom_get_data(vc_atom); - if (!vc) { + if (vc == NULL) { send_simple_response(stk, STK_RESULT_TYPE_NOT_CAPABLE); return; } @@ -1649,7 +1649,7 @@ static void confirm_call_cb(enum stk_agent_result result, gboolean confirm, if (sc->alpha_id_call_setup) { alpha_id = dbus_apply_text_attributes(sc->alpha_id_call_setup, &sc->text_attr_call_setup); - if (!alpha_id) { + if (alpha_id == NULL) { send_simple_response(stk, STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD); return; @@ -1728,7 +1728,7 @@ static gboolean handle_command_set_up_call(const struct stk_command *cmd, if (vc_atom) vc = __ofono_atom_get_data(vc_atom); - if (!vc) { + if (vc == NULL) { rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE; return TRUE; } @@ -1743,7 +1743,7 @@ static gboolean handle_command_set_up_call(const struct stk_command *cmd, if (sc->alpha_id_usr_cfm) { alpha_id = dbus_apply_text_attributes(sc->alpha_id_usr_cfm, &sc->text_attr_usr_cfm); - if (!alpha_id) { + if (alpha_id == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -1776,7 +1776,7 @@ static void send_ussd_cancel(struct ofono_stk *stk) atom = __ofono_modem_find_atom(__ofono_atom_get_modem(stk->atom), OFONO_ATOM_TYPE_USSD); - if (!atom) + if (atom == NULL) return; ussd = __ofono_atom_get_data(atom); @@ -1891,7 +1891,7 @@ static gboolean handle_command_send_ussd(const struct stk_command *cmd, } atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD); - if (!atom || !__ofono_atom_get_registered(atom)) { + if (atom == NULL || !__ofono_atom_get_registered(atom)) { rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE; return TRUE; } @@ -2062,7 +2062,7 @@ static gboolean handle_command_send_dtmf(const struct stk_command *cmd, if (vc_atom) vc = __ofono_atom_get_data(vc_atom); - if (!vc) { + if (vc == NULL) { rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE; return TRUE; } @@ -2070,7 +2070,7 @@ static gboolean handle_command_send_dtmf(const struct stk_command *cmd, /* Convert the DTMF string to phone number format */ for (pos = 0; cmd->send_dtmf.dtmf[pos] != '\0'; pos++) { digit = strchr(dtmf_from, cmd->send_dtmf.dtmf[pos]); - if (!digit) { + if (digit == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; } @@ -2205,7 +2205,7 @@ static gboolean handle_command_play_tone(const struct stk_command *cmd, int err; if (pt->tone > sizeof(tone_infos) / sizeof(*tone_infos) || - !tone_infos[pt->tone].name) { + tone_infos[pt->tone].name == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; @@ -2213,7 +2213,7 @@ static gboolean handle_command_play_tone(const struct stk_command *cmd, text = dbus_apply_text_attributes(pt->alpha_id ? pt->alpha_id : "", &pt->text_attr); - if (!text) { + if (text == NULL) { rsp->result.type = STK_RESULT_TYPE_DATA_NOT_UNDERSTOOD; return TRUE; @@ -2299,7 +2299,7 @@ void ofono_stk_proactive_command_notify(struct ofono_stk *stk, stk_proactive_command_cancel(stk); stk->pending_cmd = stk_command_new_from_pdu(pdu, length); - if (!stk->pending_cmd) { + if (stk->pending_cmd == NULL) { ofono_error("Can't parse proactive command"); /* @@ -2472,7 +2472,7 @@ void ofono_stk_proactive_command_handled_notify(struct ofono_stk *stk, cmd = stk_command_new_from_pdu(pdu, length); - if (!cmd || cmd->status != STK_PARSE_RESULT_OK) { + if (cmd == NULL || cmd->status != STK_PARSE_RESULT_OK) { ofono_error("Can't parse proactive command"); if (cmd) diff --git a/src/stkagent.c b/src/stkagent.c index 5cf83e4..8315040 100644 --- a/src/stkagent.c +++ b/src/stkagent.c @@ -218,7 +218,7 @@ struct stk_agent *stk_agent_new(const char *path, const char *sender, struct stk_agent *agent = g_try_new0(struct stk_agent, 1); DBusConnection *conn = ofono_dbus_get_connection(); - if (!agent) + if (agent == NULL) return NULL; agent->path = g_strdup(path); diff --git a/src/stkutil.c b/src/stkutil.c index 9f3d505..a211462 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -2337,7 +2337,7 @@ static enum stk_command_parse_result parse_dataobj( } } - if (!l2) { + if (l2 == NULL) { if (comprehension_tlv_get_cr(iter) == TRUE) parse_error = TRUE; @@ -4145,7 +4145,7 @@ static gboolean build_dataobj_text(struct stk_tlv_builder *tlv, unsigned char tag = STK_DATA_OBJECT_TYPE_TEXT; gboolean ret; - if (!text->text && !text->yesno) + if (text->text == NULL && !text->yesno) return TRUE; if (stk_tlv_builder_open_container(tlv, cr, tag, TRUE) != TRUE) diff --git a/src/ussd.c b/src/ussd.c index c4de177..6f3e38f 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -76,7 +76,7 @@ struct ssc_entry { gboolean __ofono_ussd_is_busy(struct ofono_ussd *ussd) { - if (!ussd) + if (ussd == NULL) return FALSE; if (ussd->pending || ussd->state != USSD_STATE_IDLE || ussd->req) @@ -92,7 +92,7 @@ static struct ssc_entry *ssc_entry_create(const char *sc, void *cb, void *data, r = g_try_new0(struct ssc_entry, 1); - if (!r) + if (r == NULL) return r; r->service = g_strdup(sc); @@ -125,12 +125,12 @@ gboolean __ofono_ussd_ssc_register(struct ofono_ussd *ussd, const char *sc, { struct ssc_entry *entry; - if (!ussd) + if (ussd == NULL) return FALSE; entry = ssc_entry_create(sc, cb, data, destroy); - if (!entry) + if (entry == NULL) return FALSE; ussd->ss_control_list = g_slist_prepend(ussd->ss_control_list, entry); @@ -142,13 +142,13 @@ void __ofono_ussd_ssc_unregister(struct ofono_ussd *ussd, const char *sc) { GSList *l; - if (!ussd) + if (ussd == NULL) return; l = g_slist_find_custom(ussd->ss_control_list, sc, ssc_entry_find_by_service); - if (!l) + if (l == NULL) return; ssc_entry_destroy(l->data); @@ -161,12 +161,12 @@ gboolean __ofono_ussd_passwd_register(struct ofono_ussd *ussd, const char *sc, { struct ssc_entry *entry; - if (!ussd) + if (ussd == NULL) return FALSE; entry = ssc_entry_create(sc, cb, data, destroy); - if (!entry) + if (entry == NULL) return FALSE; ussd->ss_passwd_list = g_slist_prepend(ussd->ss_passwd_list, entry); @@ -178,13 +178,13 @@ void __ofono_ussd_passwd_unregister(struct ofono_ussd *ussd, const char *sc) { GSList *l; - if (!ussd) + if (ussd == NULL) return; l = g_slist_find_custom(ussd->ss_passwd_list, sc, ssc_entry_find_by_service); - if (!l) + if (l == NULL) return; ssc_entry_destroy(l->data); @@ -420,7 +420,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, if (status == OFONO_USSD_STATUS_NOT_SUPPORTED) { ussd_change_state(ussd, USSD_STATE_IDLE); - if (!ussd->pending) + if (ussd->pending == NULL) return; reply = __ofono_error_not_supported(ussd->pending); @@ -430,7 +430,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, if (status == OFONO_USSD_STATUS_TIMED_OUT) { ussd_change_state(ussd, USSD_STATE_IDLE); - if (!ussd->pending) + if (ussd->pending == NULL) return; reply = __ofono_error_timed_out(ussd->pending); @@ -447,7 +447,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, reply = dbus_message_new_method_return(ussd->pending); - if (!str) + if (str == NULL) str = ""; dbus_message_iter_init_append(reply, &iter); @@ -471,7 +471,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, } else if (ussd->state == USSD_STATE_RESPONSE_SENT) { reply = dbus_message_new_method_return(ussd->pending); - if (!str) + if (str == NULL) str = ""; dbus_message_append_args(reply, DBUS_TYPE_STRING, &str, @@ -494,7 +494,7 @@ void ofono_ussd_notify(struct ofono_ussd *ussd, int status, int dcs, signal_name = "NotificationReceived"; } - if (!str) + if (str == NULL) str = ""; g_dbus_emit_signal(conn, path, @@ -534,7 +534,7 @@ static void ussd_callback(const struct ofono_error *error, void *data) return; } - if (!ussd->pending) + if (ussd->pending == NULL) return; reply = __ofono_error_failed(ussd->pending); @@ -583,7 +583,7 @@ static DBusMessage *ussd_initiate(DBusConnection *conn, DBusMessage *msg, if (!ussd_encode(str, &num_packed, buf)) return __ofono_error_invalid_format(msg); - if (!ussd->driver->request) + if (ussd->driver->request == NULL) return __ofono_error_not_implemented(msg); DBG("OK, running USSD request"); @@ -609,7 +609,7 @@ static void ussd_response_callback(const struct ofono_error *error, void *data) return; } - if (!ussd->pending) + if (ussd->pending == NULL) return; reply = __ofono_error_failed(ussd->pending); @@ -641,7 +641,7 @@ static DBusMessage *ussd_respond(DBusConnection *conn, DBusMessage *msg, if (!ussd_encode(str, &num_packed, buf)) return __ofono_error_invalid_format(msg); - if (!ussd->driver->request) + if (ussd->driver->request == NULL) return __ofono_error_not_implemented(msg); ussd->pending = dbus_message_ref(msg); @@ -696,7 +696,7 @@ static DBusMessage *ussd_cancel(DBusConnection *conn, DBusMessage *msg, if (ussd->cancel) return __ofono_error_busy(msg); - if (!ussd->driver->cancel) + if (ussd->driver->cancel == NULL) return __ofono_error_not_implemented(msg); ussd->cancel = dbus_message_ref(msg); @@ -716,7 +716,7 @@ static DBusMessage *ussd_get_properties(DBusConnection *conn, const char *value; reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -893,7 +893,7 @@ int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, { struct ussd_request *req; - if (!ussd->driver->request) + if (ussd->driver->request == NULL) return -ENOSYS; if (__ofono_ussd_is_busy(ussd)) @@ -915,7 +915,7 @@ int __ofono_ussd_initiate(struct ofono_ussd *ussd, int dcs, void __ofono_ussd_initiate_cancel(struct ofono_ussd *ussd) { - if (!ussd->req || !ussd->req->cb) + if (ussd->req == NULL || ussd->req->cb == NULL) return; ussd->req->cb = NULL; diff --git a/src/util.c b/src/util.c index 4421c3d..fa732b4 100644 --- a/src/util.c +++ b/src/util.c @@ -590,7 +590,7 @@ char *convert_gsm_to_utf8_with_lang(const unsigned char *text, long len, res = g_try_malloc(res_length + 1); - if (!res) + if (res == NULL) goto error; out = res; @@ -694,7 +694,7 @@ unsigned char *convert_utf8_to_gsm_with_lang(const char *text, long len, res = g_try_malloc(res_len + (terminator ? 1 : 0)); - if (!res) + if (res == NULL) goto err_out; in = text; @@ -1060,7 +1060,7 @@ unsigned char *pack_7bit(const unsigned char *in, long len, int byte_offset, long total_bits; unsigned char *buf; - if (len == 0 || !items_written) + if (len == 0 || items_written == NULL) return NULL; if (len < 0) { @@ -1198,7 +1198,7 @@ char *sim_string_to_utf8(const unsigned char *buffer, int length) utf8 = g_try_malloc(res_len + 1); - if (!utf8) + if (utf8 == NULL) return NULL; i = offset; @@ -1248,14 +1248,14 @@ unsigned char *utf8_to_sim_string(const char *utf, ucs2 = (guint8 *) g_convert(utf, -1, "UCS-2BE//TRANSLIT", "UTF-8", NULL, &converted, NULL); - if (!ucs2) + if (ucs2 == NULL) return NULL; if (max_length != -1 && (int) converted + 1 > max_length) converted = (max_length - 1) & ~1; result = g_try_malloc(converted + 1); - if (!result) { + if (result == NULL) { g_free(ucs2); return NULL; } @@ -1329,7 +1329,7 @@ unsigned char *convert_ucs2_to_gsm_with_lang(const unsigned char *text, } res = g_try_malloc(res_len + (terminator ? 1 : 0)); - if (!res) + if (res == NULL) goto err_out; in = text; diff --git a/src/voicecall.c b/src/voicecall.c index a91f14f..2e0b4ea 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -370,7 +370,7 @@ static DBusMessage *voicecall_get_properties(DBusConnection *conn, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -398,7 +398,7 @@ static DBusMessage *voicecall_deflect(DBusConnection *conn, call->status != CALL_STATUS_WAITING) return __ofono_error_failed(msg); - if (!vc->driver->deflect) + if (vc->driver->deflect == NULL) return __ofono_error_not_implemented(msg); if (vc->pending) @@ -423,10 +423,10 @@ static DBusMessage *voicecall_deflect(DBusConnection *conn, static void dial_request_user_cancel(struct ofono_voicecall *vc, struct voicecall *call) { - if (!vc->dial_req) + if (vc->dial_req == NULL) return; - if (!call || call == vc->dial_req->call) + if (call == NULL || call == vc->dial_req->call) dial_request_finish(vc); } @@ -533,7 +533,7 @@ static DBusMessage *voicecall_answer(DBusConnection *conn, if (call->status != CALL_STATUS_INCOMING) return __ofono_error_failed(msg); - if (!vc->driver->answer) + if (vc->driver->answer == NULL) return __ofono_error_not_implemented(msg); if (vc->pending) @@ -570,7 +570,7 @@ static struct voicecall *voicecall_create(struct ofono_voicecall *vc, v = g_try_new0(struct voicecall, 1); - if (!v) + if (v == NULL) return NULL; v->call = call; @@ -729,7 +729,7 @@ static gboolean voicecall_dbus_register(struct voicecall *v) DBusConnection *conn = ofono_dbus_get_connection(); const char *path; - if (!v) + if (v == NULL) return FALSE; path = voicecall_build_path(v->vc, v->call); @@ -879,10 +879,10 @@ static void voicecalls_multiparty_changed(GSList *old, GSList *new) nc = n ? n->data : NULL; oc = o ? o->data : NULL; - if (oc && (!nc || (nc->call->id > oc->call->id))) { + if (oc && (nc == NULL || (nc->call->id > oc->call->id))) { voicecall_emit_multiparty(oc, FALSE); o = o->next; - } else if (nc && (!oc || (nc->call->id < oc->call->id))) { + } else if (nc && (oc == NULL || (nc->call->id < oc->call->id))) { voicecall_emit_multiparty(nc, TRUE); n = n->next; } else { @@ -957,7 +957,7 @@ static void voicecalls_release_next(struct ofono_voicecall *vc) { struct voicecall *call; - if (!vc->release_list) + if (vc->release_list == NULL) return; call = vc->release_list->data; @@ -998,7 +998,7 @@ static DBusMessage *manager_get_properties(DBusConnection *conn, reply = dbus_message_new_method_return(msg); - if (!reply) + if (reply == NULL) return NULL; dbus_message_iter_init_append(reply, &iter); @@ -1047,7 +1047,7 @@ static struct ofono_call *synthesize_outgoing_call(struct ofono_voicecall *vc, call = g_try_new0(struct ofono_call, 1); - if (!call) + if (call == NULL) return call; call->id = __ofono_modem_callid_next(modem); @@ -1102,11 +1102,11 @@ static struct voicecall *dial_handle_result(struct ofono_voicecall *vc, } call = synthesize_outgoing_call(vc, number); - if (!call) + if (call == NULL) return NULL; v = voicecall_create(vc, call); - if (!v) + if (v == NULL) return NULL; v->detect_time = time(NULL); @@ -1178,7 +1178,7 @@ static DBusMessage *manager_dial(DBusConnection *conn, if (clir_string_to_clir(clirstr, &clir) == FALSE) return __ofono_error_invalid_format(msg); - if (!vc->driver->dial) + if (vc->driver->dial == NULL) return __ofono_error_not_implemented(msg); if (voicecalls_have_incoming(vc)) @@ -1225,7 +1225,7 @@ static DBusMessage *manager_transfer(DBusConnection *conn, if ((numactive != 1) && (numheld != 1)) return __ofono_error_failed(msg); - if (!vc->driver->transfer) + if (vc->driver->transfer == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1265,7 +1265,7 @@ static DBusMessage *manager_swap_calls(DBusConnection *conn, if (voicecalls_have_waiting(vc)) return __ofono_error_failed(msg); - if (!vc->driver->hold_all_active) + if (vc->driver->hold_all_active == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1286,7 +1286,7 @@ static DBusMessage *manager_release_and_answer(DBusConnection *conn, if (!voicecalls_have_waiting(vc)) return __ofono_error_failed(msg); - if (!vc->driver->release_all_active) + if (vc->driver->release_all_active == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1314,7 +1314,7 @@ static DBusMessage *manager_hold_and_answer(DBusConnection *conn, if (voicecalls_have_active(vc) && voicecalls_have_held(vc)) return __ofono_error_failed(msg); - if (!vc->driver->hold_all_active) + if (vc->driver->hold_all_active == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1448,7 +1448,7 @@ static DBusMessage *multiparty_private_chat(DBusConnection *conn, c = strrchr(callpath, '/'); - if (!c || strncmp(path, callpath, c-callpath)) + if (c == NULL || strncmp(path, callpath, c-callpath)) return __ofono_error_not_found(msg); if (!sscanf(c, "/voicecall%2u", &id)) @@ -1460,7 +1460,7 @@ static DBusMessage *multiparty_private_chat(DBusConnection *conn, break; } - if (!l) + if (l == NULL) return __ofono_error_not_found(msg); /* @@ -1471,7 +1471,7 @@ static DBusMessage *multiparty_private_chat(DBusConnection *conn, if (voicecalls_have_held(vc)) return __ofono_error_failed(msg); - if (!vc->driver->private_chat) + if (vc->driver->private_chat == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1540,7 +1540,7 @@ static DBusMessage *multiparty_create(DBusConnection *conn, if (!voicecalls_have_held(vc) || !voicecalls_have_active(vc)) return __ofono_error_failed(msg); - if (!vc->driver->create_multiparty) + if (vc->driver->create_multiparty == NULL) return __ofono_error_not_implemented(msg); vc->pending = dbus_message_ref(msg); @@ -1558,13 +1558,13 @@ static DBusMessage *multiparty_hangup(DBusConnection *conn, if (vc->pending) return __ofono_error_busy(msg); - if (!vc->driver->release_specific) + if (vc->driver->release_specific == NULL) return __ofono_error_not_implemented(msg); - if (!vc->driver->release_all_held) + if (vc->driver->release_all_held == NULL) return __ofono_error_not_implemented(msg); - if (!vc->driver->release_all_active) + if (vc->driver->release_all_active == NULL) return __ofono_error_not_implemented(msg); if (vc->multiparty_list == NULL) { @@ -1628,7 +1628,7 @@ static DBusMessage *manager_tone(DBusConnection *conn, if (vc->pending) return __ofono_error_busy(msg); - if (!vc->driver->send_tones) + if (vc->driver->send_tones == NULL) return __ofono_error_not_implemented(msg); /* Send DTMFs only if we have at least one connected call */ @@ -1760,7 +1760,7 @@ void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id, l = g_slist_find_custom(vc->call_list, GUINT_TO_POINTER(id), call_compare_by_id); - if (!l) { + if (l == NULL) { ofono_error("Plugin notified us of call disconnect for" " unknown call"); return; @@ -1839,14 +1839,14 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc, newcall = g_memdup(call, sizeof(struct ofono_call)); - if (!newcall) { + if (newcall == NULL) { ofono_error("Unable to allocate call"); goto error; } v = voicecall_create(vc, newcall); - if (!v) { + if (v == NULL) { ofono_error("Unable to allocate voicecall_data"); goto error; } @@ -2363,7 +2363,7 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc, if (!valid_phone_number_format(addr)) return -EINVAL; - if (!vc->driver->dial) + if (vc->driver->dial == NULL) return -ENOSYS; if (interaction == OFONO_VOICECALL_INTERACTION_DISCONNECT && @@ -2419,7 +2419,7 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc, void __ofono_voicecall_dial_cancel(struct ofono_voicecall *vc) { - if (!vc->dial_req || !vc->dial_req->cb) + if (vc->dial_req == NULL || vc->dial_req->cb == NULL) return; vc->dial_req->cb = NULL; @@ -2431,7 +2431,7 @@ static void tone_request_cb(const struct ofono_error *error, void *data) struct tone_queue_entry *entry = g_queue_peek_head(vc->toneq); int len = 0; - if (!entry) + if (entry == NULL) return; /* @@ -2477,7 +2477,7 @@ static gboolean tone_request_run(gpointer user_data) vc->tone_source = 0; - if (!entry) + if (entry == NULL) return FALSE; len = strcspn(entry->left, "pP"); @@ -2504,7 +2504,7 @@ int __ofono_voicecall_tone_send(struct ofono_voicecall *vc, const char *tone_str, ofono_voicecall_tone_cb_t cb, void *user_data) { - if (!vc->driver->send_tones) + if (vc->driver->send_tones == NULL) return -ENOSYS; /* Send DTMFs only if we have at least one connected call */ -- 1.7.3.2