diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-09 18:54:13 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:33 +0100 |
| commit | 46248460156fd8d558372df3c1a06f9d06aad15e (patch) | |
| tree | 3820285c241da0c5c9fa13ff4c83282d1cdcdbae /libmm-glib/mm-sim.c | |
| parent | 62469445101babdff53d238e602d7e988dbaa0cb (diff) | |
libmm-glib: return NULL instead of empty strings
Diffstat (limited to 'libmm-glib/mm-sim.c')
| -rw-r--r-- | libmm-glib/mm-sim.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libmm-glib/mm-sim.c b/libmm-glib/mm-sim.c index 46722fdd..40bb93b0 100644 --- a/libmm-glib/mm-sim.c +++ b/libmm-glib/mm-sim.c @@ -20,6 +20,7 @@ * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org> */ +#include "mm-helpers.h" #include "mm-sim.h" /** @@ -76,7 +77,8 @@ mm_sim_get_identifier (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_get_sim_identifier (self); + RETURN_NON_EMPTY_CONSTANT_STRING ( + mm_gdbus_sim_get_sim_identifier (self)); } /** @@ -92,7 +94,8 @@ mm_sim_dup_identifier (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_dup_sim_identifier (self); + RETURN_NON_EMPTY_STRING ( + mm_gdbus_sim_dup_sim_identifier (self)); } /** @@ -110,7 +113,8 @@ mm_sim_get_imsi (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_get_imsi (self); + RETURN_NON_EMPTY_CONSTANT_STRING ( + mm_gdbus_sim_get_imsi (self)); } /** @@ -126,7 +130,8 @@ mm_sim_dup_imsi (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_dup_imsi (self); + RETURN_NON_EMPTY_STRING ( + mm_gdbus_sim_dup_imsi (self)); } /** @@ -144,7 +149,8 @@ mm_sim_get_operator_identifier (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_get_operator_identifier (self); + RETURN_NON_EMPTY_CONSTANT_STRING ( + mm_gdbus_sim_get_operator_identifier (self)); } /** @@ -160,7 +166,8 @@ mm_sim_dup_operator_identifier (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_dup_operator_identifier (self); + RETURN_NON_EMPTY_STRING ( + mm_gdbus_sim_dup_operator_identifier (self)); } /** @@ -178,7 +185,8 @@ mm_sim_get_operator_name (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_get_operator_name (self); + RETURN_NON_EMPTY_CONSTANT_STRING ( + mm_gdbus_sim_get_operator_name (self)); } /** @@ -194,7 +202,8 @@ mm_sim_dup_operator_name (MMSim *self) { g_return_val_if_fail (MM_GDBUS_IS_SIM (self), NULL); - return mm_gdbus_sim_dup_operator_name (self); + RETURN_NON_EMPTY_STRING ( + mm_gdbus_sim_dup_operator_name (self)); } /** |