[network-manager-applet/aleksander/mobile-providers: 9/19] libnm-gtk: use tabs to indent and spaces to align in mobile providers code
- From: Aleksander Morgado <aleksm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/aleksander/mobile-providers: 9/19] libnm-gtk: use tabs to indent and spaces to align in mobile providers code
- Date: Sun, 2 Dec 2012 18:52:46 +0000 (UTC)
commit 99e1c7dbe91be6f823f636767ea14c2b7b4b7814
Author: Aleksander Morgado <aleksander lanedo com>
Date: Mon Nov 26 18:58:17 2012 +0100
libnm-gtk: use tabs to indent and spaces to align in mobile providers code
... and therefore align with the project code style rules.
src/libnm-gtk/nm-mobile-providers.c | 1182 +++++++++++++++++-----------------
src/libnm-gtk/nm-mobile-providers.h | 2 +-
2 files changed, 592 insertions(+), 592 deletions(-)
---
diff --git a/src/libnm-gtk/nm-mobile-providers.c b/src/libnm-gtk/nm-mobile-providers.c
index 1408ee1..96ff96d 100644
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -7,7 +7,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -50,32 +50,32 @@ G_DEFINE_BOXED_TYPE (NMAMccMnc, nma_mcc_mnc, mcc_mnc_copy, mcc_mnc_free)
static NMAMccMnc *
mcc_mnc_new (const char *mcc, const char *mnc)
{
- NMAMccMnc *m;
+ NMAMccMnc *m;
- m = g_slice_new0 (NMAMccMnc);
- m->mcc = g_strstrip (g_strdup (mcc));
- m->mnc = g_strstrip (g_strdup (mnc));
- return m;
+ m = g_slice_new0 (NMAMccMnc);
+ m->mcc = g_strstrip (g_strdup (mcc));
+ m->mnc = g_strstrip (g_strdup (mnc));
+ return m;
}
static NMAMccMnc *
mcc_mnc_copy (const NMAMccMnc *other)
{
- NMAMccMnc *ret;
+ NMAMccMnc *ret;
- ret = g_slice_new (NMAMccMnc);
- ret->mcc = g_strdup (other->mcc);
- ret->mnc = g_strdup (other->mnc);
- return ret;
+ ret = g_slice_new (NMAMccMnc);
+ ret->mcc = g_strdup (other->mcc);
+ ret->mnc = g_strdup (other->mnc);
+ return ret;
}
static void
mcc_mnc_free (NMAMccMnc *m)
{
- g_return_if_fail (m != NULL);
- g_free (m->mcc);
- g_free (m->mnc);
- g_slice_free (NMAMccMnc, m);
+ g_return_if_fail (m != NULL);
+ g_free (m->mcc);
+ g_free (m->mnc);
+ g_slice_free (NMAMccMnc, m);
}
/******************************************************************************/
@@ -87,66 +87,66 @@ G_DEFINE_BOXED_TYPE (NMAMobileAccessMethod,
nma_mobile_access_method_unref)
struct _NMAMobileAccessMethod {
- volatile gint refs;
+ volatile gint refs;
- char *name;
- /* maps lang (char *) -> name (char *) */
- GHashTable *lcl_names;
+ char *name;
+ /* maps lang (char *) -> name (char *) */
+ GHashTable *lcl_names;
- char *username;
- char *password;
- char *gateway;
- GSList *dns; /* GSList of 'char *' */
+ char *username;
+ char *password;
+ char *gateway;
+ GSList *dns; /* GSList of 'char *' */
- /* Only used with 3GPP family type providers */
- char *apn;
+ /* Only used with 3GPP family type providers */
+ char *apn;
- NMAMobileFamily family;
+ NMAMobileFamily family;
};
static NMAMobileAccessMethod *
access_method_new (void)
{
- NMAMobileAccessMethod *method;
+ NMAMobileAccessMethod *method;
- method = g_slice_new0 (NMAMobileAccessMethod);
- method->refs = 1;
- method->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
+ method = g_slice_new0 (NMAMobileAccessMethod);
+ method->refs = 1;
+ method->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
- return method;
+ return method;
}
NMAMobileAccessMethod *
nma_mobile_access_method_ref (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
- g_return_val_if_fail (method->refs > 0, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method->refs > 0, NULL);
- g_atomic_int_inc (&method->refs);
+ g_atomic_int_inc (&method->refs);
- return method;
+ return method;
}
void
nma_mobile_access_method_unref (NMAMobileAccessMethod *method)
{
- g_return_if_fail (method != NULL);
- g_return_if_fail (method->refs > 0);
-
- if (g_atomic_int_dec_and_test (&method->refs)) {
- g_free (method->name);
- g_hash_table_destroy (method->lcl_names);
- g_free (method->username);
- g_free (method->password);
- g_free (method->gateway);
- g_free (method->apn);
- g_slist_foreach (method->dns, (GFunc) g_free, NULL);
- g_slist_free (method->dns);
-
- g_slice_free (NMAMobileAccessMethod, method);
- }
+ g_return_if_fail (method != NULL);
+ g_return_if_fail (method->refs > 0);
+
+ if (g_atomic_int_dec_and_test (&method->refs)) {
+ g_free (method->name);
+ g_hash_table_destroy (method->lcl_names);
+ g_free (method->username);
+ g_free (method->password);
+ g_free (method->gateway);
+ g_free (method->apn);
+ g_slist_foreach (method->dns, (GFunc) g_free, NULL);
+ g_slist_free (method->dns);
+
+ g_slice_free (NMAMobileAccessMethod, method);
+ }
}
/**
@@ -157,9 +157,9 @@ nma_mobile_access_method_unref (NMAMobileAccessMethod *method)
const gchar *
nma_mobile_access_method_get_name (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->name;
+ return method->name;
}
/**
@@ -170,9 +170,9 @@ nma_mobile_access_method_get_name (NMAMobileAccessMethod *method)
const gchar *
nma_mobile_access_method_get_username (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->username;
+ return method->username;
}
/**
@@ -183,9 +183,9 @@ nma_mobile_access_method_get_username (NMAMobileAccessMethod *method)
const gchar *
nma_mobile_access_method_get_password (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->password;
+ return method->password;
}
/**
@@ -196,9 +196,9 @@ nma_mobile_access_method_get_password (NMAMobileAccessMethod *method)
const gchar *
nma_mobile_access_method_get_gateway (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->gateway;
+ return method->gateway;
}
/**
@@ -209,9 +209,9 @@ nma_mobile_access_method_get_gateway (NMAMobileAccessMethod *method)
const GSList *
nma_mobile_access_method_get_dns (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->dns;
+ return method->dns;
}
/**
@@ -222,9 +222,9 @@ nma_mobile_access_method_get_dns (NMAMobileAccessMethod *method)
const gchar *
nma_mobile_access_method_get_3gpp_apn (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NULL);
+ g_return_val_if_fail (method != NULL, NULL);
- return method->apn;
+ return method->apn;
}
/**
@@ -235,9 +235,9 @@ nma_mobile_access_method_get_3gpp_apn (NMAMobileAccessMethod *method)
NMAMobileFamily
nma_mobile_access_method_get_family (NMAMobileAccessMethod *method)
{
- g_return_val_if_fail (method != NULL, NMA_MOBILE_FAMILY_UNKNOWN);
+ g_return_val_if_fail (method != NULL, NMA_MOBILE_FAMILY_UNKNOWN);
- return method->family;
+ return method->family;
}
/******************************************************************************/
@@ -249,60 +249,60 @@ G_DEFINE_BOXED_TYPE (NMAMobileProvider,
nma_mobile_provider_unref)
struct _NMAMobileProvider {
- volatile gint refs;
+ volatile gint refs;
- char *name;
- /* maps lang (char *) -> name (char *) */
- GHashTable *lcl_names;
+ char *name;
+ /* maps lang (char *) -> name (char *) */
+ GHashTable *lcl_names;
- GSList *methods; /* GSList of NmaMobileAccessMethod */
+ GSList *methods; /* GSList of NmaMobileAccessMethod */
- GSList *mcc_mnc; /* GSList of NmaMccMnc */
- GSList *cdma_sid; /* GSList of guint32 */
+ GSList *mcc_mnc; /* GSList of NmaMccMnc */
+ GSList *cdma_sid; /* GSList of guint32 */
};
static NMAMobileProvider *
provider_new (void)
{
- NMAMobileProvider *provider;
+ NMAMobileProvider *provider;
- provider = g_slice_new0 (NMAMobileProvider);
- provider->refs = 1;
- provider->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) g_free);
+ provider = g_slice_new0 (NMAMobileProvider);
+ provider->refs = 1;
+ provider->lcl_names = g_hash_table_new_full (g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) g_free);
- return provider;
+ return provider;
}
NMAMobileProvider *
nma_mobile_provider_ref (NMAMobileProvider *provider)
{
- g_return_val_if_fail (provider != NULL, NULL);
- g_return_val_if_fail (provider->refs > 0, NULL);
+ g_return_val_if_fail (provider != NULL, NULL);
+ g_return_val_if_fail (provider->refs > 0, NULL);
- g_atomic_int_inc (&provider->refs);
+ g_atomic_int_inc (&provider->refs);
- return provider;
+ return provider;
}
void
nma_mobile_provider_unref (NMAMobileProvider *provider)
{
- if (g_atomic_int_dec_and_test (&provider->refs)) {
- g_free (provider->name);
- g_hash_table_destroy (provider->lcl_names);
+ if (g_atomic_int_dec_and_test (&provider->refs)) {
+ g_free (provider->name);
+ g_hash_table_destroy (provider->lcl_names);
- g_slist_foreach (provider->methods, (GFunc) nma_mobile_access_method_unref, NULL);
- g_slist_free (provider->methods);
+ g_slist_foreach (provider->methods, (GFunc) nma_mobile_access_method_unref, NULL);
+ g_slist_free (provider->methods);
- g_slist_foreach (provider->mcc_mnc, (GFunc) mcc_mnc_free, NULL);
- g_slist_free (provider->mcc_mnc);
+ g_slist_foreach (provider->mcc_mnc, (GFunc) mcc_mnc_free, NULL);
+ g_slist_free (provider->mcc_mnc);
- g_slist_free (provider->cdma_sid);
+ g_slist_free (provider->cdma_sid);
- g_slice_free (NMAMobileProvider, provider);
- }
+ g_slice_free (NMAMobileProvider, provider);
+ }
}
/**
@@ -313,9 +313,9 @@ nma_mobile_provider_unref (NMAMobileProvider *provider)
const gchar *
nma_mobile_provider_get_name (NMAMobileProvider *provider)
{
- g_return_val_if_fail (provider != NULL, NULL);
+ g_return_val_if_fail (provider != NULL, NULL);
- return provider->name;
+ return provider->name;
}
/**
@@ -323,14 +323,14 @@ nma_mobile_provider_get_name (NMAMobileProvider *provider)
* @provider: a #NMAMobileProvider
*
* Returns: (element-type NMGtk.MobileAccessMethod) (transfer none): the
- * list of #NMAMobileAccessMethod this provider exposes.
+ * list of #NMAMobileAccessMethod this provider exposes.
*/
GSList *
nma_mobile_provider_get_methods (NMAMobileProvider *provider)
{
- g_return_val_if_fail (provider != NULL, NULL);
+ g_return_val_if_fail (provider != NULL, NULL);
- return provider->methods;
+ return provider->methods;
}
/**
@@ -338,14 +338,14 @@ nma_mobile_provider_get_methods (NMAMobileProvider *provider)
* @provider: a #NMAMobileProvider
*
* Returns: (element-type NMGtk.MccMnc) (transfer none): the
- * list of #NMAMccMnc this provider exposes
+ * list of #NMAMccMnc this provider exposes
*/
GSList *
nma_mobile_provider_get_3gpp_mcc_mnc (NMAMobileProvider *provider)
{
- g_return_val_if_fail (provider != NULL, NULL);
+ g_return_val_if_fail (provider != NULL, NULL);
- return provider->mcc_mnc;
+ return provider->mcc_mnc;
}
/**
@@ -353,14 +353,14 @@ nma_mobile_provider_get_3gpp_mcc_mnc (NMAMobileProvider *provider)
* @provider: a #NMAMobileProvider
*
* Returns: (element-type guint32) (transfer none): the
- * list of CDMA SIDs this provider exposes
+ * list of CDMA SIDs this provider exposes
*/
GSList *
nma_mobile_provider_get_cdma_sid (NMAMobileProvider *provider)
{
- g_return_val_if_fail (provider != NULL, NULL);
+ g_return_val_if_fail (provider != NULL, NULL);
- return provider->cdma_sid;
+ return provider->cdma_sid;
}
/******************************************************************************/
@@ -372,47 +372,47 @@ G_DEFINE_BOXED_TYPE (NMACountryInfo,
nma_country_info_unref)
struct _NMACountryInfo {
- volatile gint refs;
+ volatile gint refs;
- char *country_code;
- char *country_name;
- GSList *providers;
+ char *country_code;
+ char *country_name;
+ GSList *providers;
};
static NMACountryInfo *
country_info_new (const char *country_code,
const gchar *country_name)
{
- NMACountryInfo *country_info;
+ NMACountryInfo *country_info;
- country_info = g_slice_new0 (NMACountryInfo);
- country_info->refs = 1;
- country_info->country_code = g_strdup (country_code);
- country_info->country_name = g_strdup (country_name);
- return country_info;
+ country_info = g_slice_new0 (NMACountryInfo);
+ country_info->refs = 1;
+ country_info->country_code = g_strdup (country_code);
+ country_info->country_name = g_strdup (country_name);
+ return country_info;
}
NMACountryInfo *
nma_country_info_ref (NMACountryInfo *country_info)
{
- g_return_val_if_fail (country_info != NULL, NULL);
- g_return_val_if_fail (country_info->refs > 0, NULL);
+ g_return_val_if_fail (country_info != NULL, NULL);
+ g_return_val_if_fail (country_info->refs > 0, NULL);
- g_atomic_int_inc (&country_info->refs);
+ g_atomic_int_inc (&country_info->refs);
- return country_info;
+ return country_info;
}
void
nma_country_info_unref (NMACountryInfo *country_info)
{
- if (g_atomic_int_dec_and_test (&country_info->refs)) {
- g_free (country_info->country_code);
- g_free (country_info->country_name);
- g_slist_free_full (country_info->providers,
- (GDestroyNotify) nma_mobile_provider_unref);
- g_slice_free (NMACountryInfo, country_info);
- }
+ if (g_atomic_int_dec_and_test (&country_info->refs)) {
+ g_free (country_info->country_code);
+ g_free (country_info->country_name);
+ g_slist_free_full (country_info->providers,
+ (GDestroyNotify) nma_mobile_provider_unref);
+ g_slice_free (NMACountryInfo, country_info);
+ }
}
/**
@@ -423,9 +423,9 @@ nma_country_info_unref (NMACountryInfo *country_info)
const gchar *
nma_country_info_get_country_code (NMACountryInfo *country_info)
{
- g_return_val_if_fail (country_info != NULL, NULL);
+ g_return_val_if_fail (country_info != NULL, NULL);
- return country_info->country_code;
+ return country_info->country_code;
}
/**
@@ -436,23 +436,23 @@ nma_country_info_get_country_code (NMACountryInfo *country_info)
const gchar *
nma_country_info_get_country_name (NMACountryInfo *country_info)
{
- g_return_val_if_fail (country_info != NULL, NULL);
+ g_return_val_if_fail (country_info != NULL, NULL);
- return country_info->country_name;
+ return country_info->country_name;
}
/**
* nma_country_info_get_providers:
*
* Returns: (element-type NMGtk.MobileProvider) (transfer none): the
- * list of #NMAMobileProvider this country exposes.
+ * list of #NMAMobileProvider this country exposes.
*/
GSList *
nma_country_info_get_providers (NMACountryInfo *country_info)
{
- g_return_val_if_fail (country_info != NULL, NULL);
+ g_return_val_if_fail (country_info != NULL, NULL);
- return country_info->providers;
+ return country_info->providers;
}
/******************************************************************************/
@@ -466,121 +466,121 @@ iso_3166_parser_start_element (GMarkupParseContext *context,
gpointer data,
GError **error)
{
- int i;
- const char *country_code = NULL;
- const char *common_name = NULL;
- const char *name = NULL;
- GHashTable *table = (GHashTable *) data;
-
- if (!strcmp (element_name, "iso_3166_entry")) {
- NMACountryInfo *country_info;
-
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "alpha_2_code"))
- country_code = attribute_values[i];
- else if (!strcmp (attribute_names[i], "common_name"))
- common_name = attribute_values[i];
- else if (!strcmp (attribute_names[i], "name"))
- name = attribute_values[i];
- }
- if (!country_code) {
- g_warning ("%s: missing mandatory 'alpha_2_code' atribute in '%s'"
- " element.", __func__, element_name);
- return;
- }
- if (!name) {
- g_warning ("%s: missing mandatory 'name' atribute in '%s'"
- " element.", __func__, element_name);
- return;
- }
-
- country_info = country_info_new (country_code,
- dgettext ("iso_3166", common_name ? common_name : name));
-
- g_hash_table_insert (table, g_strdup (country_code), country_info);
- }
+ int i;
+ const char *country_code = NULL;
+ const char *common_name = NULL;
+ const char *name = NULL;
+ GHashTable *table = (GHashTable *) data;
+
+ if (!strcmp (element_name, "iso_3166_entry")) {
+ NMACountryInfo *country_info;
+
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "alpha_2_code"))
+ country_code = attribute_values[i];
+ else if (!strcmp (attribute_names[i], "common_name"))
+ common_name = attribute_values[i];
+ else if (!strcmp (attribute_names[i], "name"))
+ name = attribute_values[i];
+ }
+ if (!country_code) {
+ g_warning ("%s: missing mandatory 'alpha_2_code' atribute in '%s'"
+ " element.", __func__, element_name);
+ return;
+ }
+ if (!name) {
+ g_warning ("%s: missing mandatory 'name' atribute in '%s'"
+ " element.", __func__, element_name);
+ return;
+ }
+
+ country_info = country_info_new (country_code,
+ dgettext ("iso_3166", common_name ? common_name : name));
+
+ g_hash_table_insert (table, g_strdup (country_code), country_info);
+ }
}
static const GMarkupParser iso_3166_parser = {
- iso_3166_parser_start_element,
- NULL, /* end element */
- NULL, /* text */
- NULL, /* passthrough */
- NULL /* error */
+ iso_3166_parser_start_element,
+ NULL, /* end element */
+ NULL, /* text */
+ NULL, /* passthrough */
+ NULL /* error */
};
static GHashTable *
read_country_codes (const gchar *country_codes_file)
{
- GHashTable *table = NULL;
- GMarkupParseContext *ctx;
- GError *error = NULL;
- char *buf;
- gsize buf_len;
-
- /* Set domain to iso_3166 for country name translation */
- bindtextdomain ("iso_3166", ISO_CODES_LOCALESDIR);
- bind_textdomain_codeset ("iso_3166", "UTF-8");
-
- if (g_file_get_contents (country_codes_file, &buf, &buf_len, &error)) {
- table = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- (GDestroyNotify)nma_country_info_unref);
- ctx = g_markup_parse_context_new (&iso_3166_parser, 0, table, NULL);
-
- if (!g_markup_parse_context_parse (ctx, buf, buf_len, &error)) {
- g_warning ("Failed to parse '%s': %s\n", country_codes_file, error->message);
- g_error_free (error);
- g_hash_table_destroy (table);
- table = NULL;
- }
-
- g_markup_parse_context_free (ctx);
- g_free (buf);
- } else {
- g_warning ("Failed to load '%s': %s\n Consider installing 'iso-codes'\n",
- country_codes_file, error->message);
- g_error_free (error);
- }
-
- return table;
+ GHashTable *table = NULL;
+ GMarkupParseContext *ctx;
+ GError *error = NULL;
+ char *buf;
+ gsize buf_len;
+
+ /* Set domain to iso_3166 for country name translation */
+ bindtextdomain ("iso_3166", ISO_CODES_LOCALESDIR);
+ bind_textdomain_codeset ("iso_3166", "UTF-8");
+
+ if (g_file_get_contents (country_codes_file, &buf, &buf_len, &error)) {
+ table = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ (GDestroyNotify)nma_country_info_unref);
+ ctx = g_markup_parse_context_new (&iso_3166_parser, 0, table, NULL);
+
+ if (!g_markup_parse_context_parse (ctx, buf, buf_len, &error)) {
+ g_warning ("Failed to parse '%s': %s\n", country_codes_file, error->message);
+ g_error_free (error);
+ g_hash_table_destroy (table);
+ table = NULL;
+ }
+
+ g_markup_parse_context_free (ctx);
+ g_free (buf);
+ } else {
+ g_warning ("Failed to load '%s': %s\n Consider installing 'iso-codes'\n",
+ country_codes_file, error->message);
+ g_error_free (error);
+ }
+
+ return table;
}
/******************************************************************************/
/* XML Parser for serviceproviders.xml */
typedef enum {
- PARSER_TOPLEVEL = 0,
- PARSER_COUNTRY,
- PARSER_PROVIDER,
- PARSER_METHOD_GSM,
- PARSER_METHOD_GSM_APN,
- PARSER_METHOD_CDMA,
- PARSER_ERROR
+ PARSER_TOPLEVEL = 0,
+ PARSER_COUNTRY,
+ PARSER_PROVIDER,
+ PARSER_METHOD_GSM,
+ PARSER_METHOD_GSM_APN,
+ PARSER_METHOD_CDMA,
+ PARSER_ERROR
} MobileContextState;
typedef struct {
- GHashTable *table;
+ GHashTable *table;
- char *current_country;
- GSList *current_providers;
- NMAMobileProvider *current_provider;
- NMAMobileAccessMethod *current_method;
+ char *current_country;
+ GSList *current_providers;
+ NMAMobileProvider *current_provider;
+ NMAMobileAccessMethod *current_method;
- char *text_buffer;
- MobileContextState state;
+ char *text_buffer;
+ MobileContextState state;
} MobileParser;
static void
provider_list_free (gpointer data)
{
- GSList *list = (GSList *) data;
+ GSList *list = (GSList *) data;
- while (list) {
- nma_mobile_provider_unref ((NMAMobileProvider *) list->data);
- list = g_slist_delete_link (list, list);
- }
+ while (list) {
+ nma_mobile_provider_unref ((NMAMobileProvider *) list->data);
+ list = g_slist_delete_link (list, list);
+ }
}
static void
@@ -589,40 +589,40 @@ parser_toplevel_start (MobileParser *parser,
const char **attribute_names,
const char **attribute_values)
{
- int i;
-
- if (!strcmp (name, "serviceproviders")) {
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "format")) {
- if (strcmp (attribute_values[i], "2.0")) {
- g_warning ("%s: mobile broadband provider database format '%s'"
- " not supported.", __func__, attribute_values[i]);
- parser->state = PARSER_ERROR;
- break;
- }
- }
- }
- } else if (!strcmp (name, "country")) {
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "code")) {
- char *country_code;
- NMACountryInfo *country_info;
-
- country_code = g_ascii_strup (attribute_values[i], -1);
- country_info = g_hash_table_lookup (parser->table, country_code);
- /* Ensure we have a country provider for this country code */
- if (!country_info) {
- g_warning ("%s: adding providers for unknown country '%s'", __func__, country_code);
- country_info = country_info_new (country_code, NULL);
- g_hash_table_insert (parser->table, country_code, country_info);
- }
- parser->current_country = country_code;
-
- parser->state = PARSER_COUNTRY;
- break;
- }
- }
- }
+ int i;
+
+ if (!strcmp (name, "serviceproviders")) {
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "format")) {
+ if (strcmp (attribute_values[i], "2.0")) {
+ g_warning ("%s: mobile broadband provider database format '%s'"
+ " not supported.", __func__, attribute_values[i]);
+ parser->state = PARSER_ERROR;
+ break;
+ }
+ }
+ }
+ } else if (!strcmp (name, "country")) {
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "code")) {
+ char *country_code;
+ NMACountryInfo *country_info;
+
+ country_code = g_ascii_strup (attribute_values[i], -1);
+ country_info = g_hash_table_lookup (parser->table, country_code);
+ /* Ensure we have a country provider for this country code */
+ if (!country_info) {
+ g_warning ("%s: adding providers for unknown country '%s'", __func__, country_code);
+ country_info = country_info_new (country_code, NULL);
+ g_hash_table_insert (parser->table, country_code, country_info);
+ }
+ parser->current_country = country_code;
+
+ parser->state = PARSER_COUNTRY;
+ break;
+ }
+ }
+ }
}
static void
@@ -631,10 +631,10 @@ parser_country_start (MobileParser *parser,
const char **attribute_names,
const char **attribute_values)
{
- if (!strcmp (name, "provider")) {
- parser->state = PARSER_PROVIDER;
- parser->current_provider = provider_new ();
- }
+ if (!strcmp (name, "provider")) {
+ parser->state = PARSER_PROVIDER;
+ parser->current_provider = provider_new ();
+ }
}
static void
@@ -643,12 +643,12 @@ parser_provider_start (MobileParser *parser,
const char **attribute_names,
const char **attribute_values)
{
- if (!strcmp (name, "gsm"))
- parser->state = PARSER_METHOD_GSM;
- else if (!strcmp (name, "cdma")) {
- parser->state = PARSER_METHOD_CDMA;
- parser->current_method = access_method_new ();
- }
+ if (!strcmp (name, "gsm"))
+ parser->state = PARSER_METHOD_GSM;
+ else if (!strcmp (name, "cdma")) {
+ parser->state = PARSER_METHOD_CDMA;
+ parser->current_method = access_method_new ();
+ }
}
static void
@@ -657,35 +657,35 @@ parser_gsm_start (MobileParser *parser,
const char **attribute_names,
const char **attribute_values)
{
- if (!strcmp (name, "network-id")) {
- const char *mcc = NULL, *mnc = NULL;
- int i;
-
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "mcc"))
- mcc = attribute_values[i];
- else if (!strcmp (attribute_names[i], "mnc"))
- mnc = attribute_values[i];
-
- if (mcc && strlen (mcc) && mnc && strlen (mnc)) {
- parser->current_provider->mcc_mnc = g_slist_prepend (parser->current_provider->mcc_mnc,
- mcc_mnc_new (mcc, mnc));
- break;
- }
- }
- } else if (!strcmp (name, "apn")) {
- int i;
-
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "value")) {
-
- parser->state = PARSER_METHOD_GSM_APN;
- parser->current_method = access_method_new ();
- parser->current_method->apn = g_strstrip (g_strdup (attribute_values[i]));
- break;
- }
- }
- }
+ if (!strcmp (name, "network-id")) {
+ const char *mcc = NULL, *mnc = NULL;
+ int i;
+
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "mcc"))
+ mcc = attribute_values[i];
+ else if (!strcmp (attribute_names[i], "mnc"))
+ mnc = attribute_values[i];
+
+ if (mcc && strlen (mcc) && mnc && strlen (mnc)) {
+ parser->current_provider->mcc_mnc = g_slist_prepend (parser->current_provider->mcc_mnc,
+ mcc_mnc_new (mcc, mnc));
+ break;
+ }
+ }
+ } else if (!strcmp (name, "apn")) {
+ int i;
+
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "value")) {
+
+ parser->state = PARSER_METHOD_GSM_APN;
+ parser->current_method = access_method_new ();
+ parser->current_method->apn = g_strstrip (g_strdup (attribute_values[i]));
+ break;
+ }
+ }
+ }
}
static void
@@ -694,22 +694,22 @@ parser_cdma_start (MobileParser *parser,
const char **attribute_names,
const char **attribute_values)
{
- if (!strcmp (name, "sid")) {
- int i;
-
- for (i = 0; attribute_names && attribute_names[i]; i++) {
- if (!strcmp (attribute_names[i], "value")) {
- unsigned long tmp;
-
- errno = 0;
- tmp = strtoul (attribute_values[i], NULL, 10);
- if (errno == 0 && tmp > 0)
- parser->current_provider->cdma_sid = g_slist_prepend (parser->current_provider->cdma_sid,
- GUINT_TO_POINTER ((guint32) tmp));
- break;
- }
- }
- }
+ if (!strcmp (name, "sid")) {
+ int i;
+
+ for (i = 0; attribute_names && attribute_names[i]; i++) {
+ if (!strcmp (attribute_names[i], "value")) {
+ unsigned long tmp;
+
+ errno = 0;
+ tmp = strtoul (attribute_values[i], NULL, 10);
+ if (errno == 0 && tmp > 0)
+ parser->current_provider->cdma_sid = g_slist_prepend (parser->current_provider->cdma_sid,
+ GUINT_TO_POINTER ((guint32) tmp));
+ break;
+ }
+ }
+ }
}
static void
@@ -720,152 +720,152 @@ mobile_parser_start_element (GMarkupParseContext *context,
gpointer data,
GError **error)
{
- MobileParser *parser = (MobileParser *) data;
-
- if (parser->text_buffer) {
- g_free (parser->text_buffer);
- parser->text_buffer = NULL;
- }
-
- switch (parser->state) {
- case PARSER_TOPLEVEL:
- parser_toplevel_start (parser, element_name, attribute_names, attribute_values);
- break;
- case PARSER_COUNTRY:
- parser_country_start (parser, element_name, attribute_names, attribute_values);
- break;
- case PARSER_PROVIDER:
- parser_provider_start (parser, element_name, attribute_names, attribute_values);
- break;
- case PARSER_METHOD_GSM:
- parser_gsm_start (parser, element_name, attribute_names, attribute_values);
- break;
- case PARSER_METHOD_CDMA:
- parser_cdma_start (parser, element_name, attribute_names, attribute_values);
- break;
- default:
- break;
- }
+ MobileParser *parser = (MobileParser *) data;
+
+ if (parser->text_buffer) {
+ g_free (parser->text_buffer);
+ parser->text_buffer = NULL;
+ }
+
+ switch (parser->state) {
+ case PARSER_TOPLEVEL:
+ parser_toplevel_start (parser, element_name, attribute_names, attribute_values);
+ break;
+ case PARSER_COUNTRY:
+ parser_country_start (parser, element_name, attribute_names, attribute_values);
+ break;
+ case PARSER_PROVIDER:
+ parser_provider_start (parser, element_name, attribute_names, attribute_values);
+ break;
+ case PARSER_METHOD_GSM:
+ parser_gsm_start (parser, element_name, attribute_names, attribute_values);
+ break;
+ case PARSER_METHOD_CDMA:
+ parser_cdma_start (parser, element_name, attribute_names, attribute_values);
+ break;
+ default:
+ break;
+ }
}
static void
parser_country_end (MobileParser *parser,
const char *name)
{
- if (!strcmp (name, "country")) {
- NMACountryInfo *country_info;
-
- country_info = g_hash_table_lookup (parser->table, parser->current_country);
- if (country_info)
- /* Store providers for this country */
- country_info->providers = parser->current_providers;
-
- parser->current_country = NULL;
- parser->current_providers = NULL;
- parser->text_buffer = NULL;
- parser->state = PARSER_TOPLEVEL;
- }
+ if (!strcmp (name, "country")) {
+ NMACountryInfo *country_info;
+
+ country_info = g_hash_table_lookup (parser->table, parser->current_country);
+ if (country_info)
+ /* Store providers for this country */
+ country_info->providers = parser->current_providers;
+
+ parser->current_country = NULL;
+ parser->current_providers = NULL;
+ parser->text_buffer = NULL;
+ parser->state = PARSER_TOPLEVEL;
+ }
}
static void
parser_provider_end (MobileParser *parser,
const char *name)
{
- if (!strcmp (name, "name")) {
- if (!parser->current_provider->name) {
- /* Use the first one. */
- parser->current_provider->name = parser->text_buffer;
- parser->text_buffer = NULL;
- }
- } else if (!strcmp (name, "provider")) {
- parser->current_provider->methods = g_slist_reverse (parser->current_provider->methods);
-
- parser->current_provider->mcc_mnc = g_slist_reverse (parser->current_provider->mcc_mnc);
- parser->current_provider->cdma_sid = g_slist_reverse (parser->current_provider->cdma_sid);
-
- parser->current_providers = g_slist_prepend (parser->current_providers, parser->current_provider);
- parser->current_provider = NULL;
- parser->text_buffer = NULL;
- parser->state = PARSER_COUNTRY;
- }
+ if (!strcmp (name, "name")) {
+ if (!parser->current_provider->name) {
+ /* Use the first one. */
+ parser->current_provider->name = parser->text_buffer;
+ parser->text_buffer = NULL;
+ }
+ } else if (!strcmp (name, "provider")) {
+ parser->current_provider->methods = g_slist_reverse (parser->current_provider->methods);
+
+ parser->current_provider->mcc_mnc = g_slist_reverse (parser->current_provider->mcc_mnc);
+ parser->current_provider->cdma_sid = g_slist_reverse (parser->current_provider->cdma_sid);
+
+ parser->current_providers = g_slist_prepend (parser->current_providers, parser->current_provider);
+ parser->current_provider = NULL;
+ parser->text_buffer = NULL;
+ parser->state = PARSER_COUNTRY;
+ }
}
static void
parser_gsm_end (MobileParser *parser,
- const char *name)
+ const char *name)
{
- if (!strcmp (name, "gsm")) {
- parser->text_buffer = NULL;
- parser->state = PARSER_PROVIDER;
- }
+ if (!strcmp (name, "gsm")) {
+ parser->text_buffer = NULL;
+ parser->state = PARSER_PROVIDER;
+ }
}
static void
parser_gsm_apn_end (MobileParser *parser,
const char *name)
{
- if (!strcmp (name, "name")) {
- if (!parser->current_method->name) {
- /* Use the first one. */
- parser->current_method->name = parser->text_buffer;
- parser->text_buffer = NULL;
- }
- } else if (!strcmp (name, "username")) {
- parser->current_method->username = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "password")) {
- parser->current_method->password = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "dns")) {
- parser->current_method->dns = g_slist_prepend (parser->current_method->dns, parser->text_buffer);
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "gateway")) {
- parser->current_method->gateway = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "apn")) {
- parser->current_method->family = NMA_MOBILE_FAMILY_3GPP;
- parser->current_method->dns = g_slist_reverse (parser->current_method->dns);
-
- if (!parser->current_method->name)
- parser->current_method->name = g_strdup (_("Default"));
-
- parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
- parser->current_method);
- parser->current_method = NULL;
- parser->text_buffer = NULL;
- parser->state = PARSER_METHOD_GSM;
- }
+ if (!strcmp (name, "name")) {
+ if (!parser->current_method->name) {
+ /* Use the first one. */
+ parser->current_method->name = parser->text_buffer;
+ parser->text_buffer = NULL;
+ }
+ } else if (!strcmp (name, "username")) {
+ parser->current_method->username = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "password")) {
+ parser->current_method->password = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "dns")) {
+ parser->current_method->dns = g_slist_prepend (parser->current_method->dns, parser->text_buffer);
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "gateway")) {
+ parser->current_method->gateway = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "apn")) {
+ parser->current_method->family = NMA_MOBILE_FAMILY_3GPP;
+ parser->current_method->dns = g_slist_reverse (parser->current_method->dns);
+
+ if (!parser->current_method->name)
+ parser->current_method->name = g_strdup (_("Default"));
+
+ parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
+ parser->current_method);
+ parser->current_method = NULL;
+ parser->text_buffer = NULL;
+ parser->state = PARSER_METHOD_GSM;
+ }
}
static void
parser_cdma_end (MobileParser *parser,
const char *name)
{
- if (!strcmp (name, "username")) {
- parser->current_method->username = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "password")) {
- parser->current_method->password = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "dns")) {
- parser->current_method->dns = g_slist_prepend (parser->current_method->dns, parser->text_buffer);
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "gateway")) {
- parser->current_method->gateway = parser->text_buffer;
- parser->text_buffer = NULL;
- } else if (!strcmp (name, "cdma")) {
- parser->current_method->family = NMA_MOBILE_FAMILY_CDMA;
- parser->current_method->dns = g_slist_reverse (parser->current_method->dns);
-
- if (!parser->current_method->name)
- parser->current_method->name = g_strdup (parser->current_provider->name);
-
- parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
- parser->current_method);
- parser->current_method = NULL;
- parser->text_buffer = NULL;
- parser->state = PARSER_PROVIDER;
- }
+ if (!strcmp (name, "username")) {
+ parser->current_method->username = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "password")) {
+ parser->current_method->password = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "dns")) {
+ parser->current_method->dns = g_slist_prepend (parser->current_method->dns, parser->text_buffer);
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "gateway")) {
+ parser->current_method->gateway = parser->text_buffer;
+ parser->text_buffer = NULL;
+ } else if (!strcmp (name, "cdma")) {
+ parser->current_method->family = NMA_MOBILE_FAMILY_CDMA;
+ parser->current_method->dns = g_slist_reverse (parser->current_method->dns);
+
+ if (!parser->current_method->name)
+ parser->current_method->name = g_strdup (parser->current_provider->name);
+
+ parser->current_provider->methods = g_slist_prepend (parser->current_provider->methods,
+ parser->current_method);
+ parser->current_method = NULL;
+ parser->text_buffer = NULL;
+ parser->state = PARSER_PROVIDER;
+ }
}
static void
@@ -874,27 +874,27 @@ mobile_parser_end_element (GMarkupParseContext *context,
gpointer data,
GError **error)
{
- MobileParser *parser = (MobileParser *) data;
-
- switch (parser->state) {
- case PARSER_COUNTRY:
- parser_country_end (parser, element_name);
- break;
- case PARSER_PROVIDER:
- parser_provider_end (parser, element_name);
- break;
- case PARSER_METHOD_GSM:
- parser_gsm_end (parser, element_name);
- break;
- case PARSER_METHOD_GSM_APN:
- parser_gsm_apn_end (parser, element_name);
- break;
- case PARSER_METHOD_CDMA:
- parser_cdma_end (parser, element_name);
- break;
- default:
- break;
- }
+ MobileParser *parser = (MobileParser *) data;
+
+ switch (parser->state) {
+ case PARSER_COUNTRY:
+ parser_country_end (parser, element_name);
+ break;
+ case PARSER_PROVIDER:
+ parser_provider_end (parser, element_name);
+ break;
+ case PARSER_METHOD_GSM:
+ parser_gsm_end (parser, element_name);
+ break;
+ case PARSER_METHOD_GSM_APN:
+ parser_gsm_apn_end (parser, element_name);
+ break;
+ case PARSER_METHOD_CDMA:
+ parser_cdma_end (parser, element_name);
+ break;
+ default:
+ break;
+ }
}
static void
@@ -904,18 +904,18 @@ mobile_parser_characters (GMarkupParseContext *context,
gpointer data,
GError **error)
{
- MobileParser *parser = (MobileParser *) data;
+ MobileParser *parser = (MobileParser *) data;
- g_free (parser->text_buffer);
- parser->text_buffer = g_strdup (text);
+ g_free (parser->text_buffer);
+ parser->text_buffer = g_strdup (text);
}
static const GMarkupParser mobile_parser = {
- mobile_parser_start_element,
- mobile_parser_end_element,
- mobile_parser_characters,
- NULL, /* passthrough */
- NULL /* error */
+ mobile_parser_start_element,
+ mobile_parser_end_element,
+ mobile_parser_characters,
+ NULL, /* passthrough */
+ NULL /* error */
};
/******************************************************************************/
@@ -927,174 +927,174 @@ static const GMarkupParser mobile_parser = {
* @service_providers: (allow-none) File with the list of service providers.
*
* Returns: (element-type utf8 NMGtk.CountryInfo) (transfer full): a
- * hash table where keys are country names #gchar and values are #NMACountryInfo.
- * Everything is destroyed with g_hash_table_destroy().
+ * hash table where keys are country names #gchar and values are #NMACountryInfo.
+ * Everything is destroyed with g_hash_table_destroy().
*/
GHashTable *
nma_mobile_providers_parse (const gchar *country_codes,
const gchar *service_providers)
{
- GMarkupParseContext *ctx;
- GIOChannel *channel;
- MobileParser parser;
- GError *error = NULL;
- char buffer[4096];
- GIOStatus status;
- gsize len = 0;
-
- /* Use default paths if none given */
- if (!country_codes)
- country_codes = ISO_3166_COUNTRY_CODES;
- if (!service_providers)
- service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
-
- memset (&parser, 0, sizeof (MobileParser));
-
- parser.table = read_country_codes (country_codes);
- if (!parser.table)
- goto out;
-
- channel = g_io_channel_new_file (service_providers, "r", &error);
- if (!channel) {
- if (error) {
- g_warning ("Could not read %s: %s", service_providers, error->message);
- g_error_free (error);
- } else
- g_warning ("Could not read %s: Unknown error", service_providers);
-
- goto out;
- }
-
- parser.state = PARSER_TOPLEVEL;
-
- ctx = g_markup_parse_context_new (&mobile_parser, 0, &parser, NULL);
-
- status = G_IO_STATUS_NORMAL;
- while (status == G_IO_STATUS_NORMAL) {
- status = g_io_channel_read_chars (channel, buffer, sizeof (buffer), &len, &error);
-
- switch (status) {
- case G_IO_STATUS_NORMAL:
- if (!g_markup_parse_context_parse (ctx, buffer, len, &error)) {
- status = G_IO_STATUS_ERROR;
- g_warning ("Error while parsing XML: %s", error->message);
- g_error_free (error);;
- }
- break;
- case G_IO_STATUS_EOF:
- break;
- case G_IO_STATUS_ERROR:
- g_warning ("Error while reading: %s", error->message);
- g_error_free (error);
- break;
- case G_IO_STATUS_AGAIN:
- /* FIXME: Try again a few times, but really, it never happes, right? */
- break;
- }
- }
-
- g_io_channel_unref (channel);
- g_markup_parse_context_free (ctx);
-
- if (parser.current_provider) {
- g_warning ("pending current provider");
- nma_mobile_provider_unref (parser.current_provider);
- }
-
- if (parser.current_providers) {
- g_warning ("pending current providers");
- provider_list_free (parser.current_providers);
- }
-
- g_free (parser.current_country);
- g_free (parser.text_buffer);
+ GMarkupParseContext *ctx;
+ GIOChannel *channel;
+ MobileParser parser;
+ GError *error = NULL;
+ char buffer[4096];
+ GIOStatus status;
+ gsize len = 0;
+
+ /* Use default paths if none given */
+ if (!country_codes)
+ country_codes = ISO_3166_COUNTRY_CODES;
+ if (!service_providers)
+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
+
+ memset (&parser, 0, sizeof (MobileParser));
+
+ parser.table = read_country_codes (country_codes);
+ if (!parser.table)
+ goto out;
+
+ channel = g_io_channel_new_file (service_providers, "r", &error);
+ if (!channel) {
+ if (error) {
+ g_warning ("Could not read %s: %s", service_providers, error->message);
+ g_error_free (error);
+ } else
+ g_warning ("Could not read %s: Unknown error", service_providers);
+
+ goto out;
+ }
+
+ parser.state = PARSER_TOPLEVEL;
+
+ ctx = g_markup_parse_context_new (&mobile_parser, 0, &parser, NULL);
+
+ status = G_IO_STATUS_NORMAL;
+ while (status == G_IO_STATUS_NORMAL) {
+ status = g_io_channel_read_chars (channel, buffer, sizeof (buffer), &len, &error);
+
+ switch (status) {
+ case G_IO_STATUS_NORMAL:
+ if (!g_markup_parse_context_parse (ctx, buffer, len, &error)) {
+ status = G_IO_STATUS_ERROR;
+ g_warning ("Error while parsing XML: %s", error->message);
+ g_error_free (error);;
+ }
+ break;
+ case G_IO_STATUS_EOF:
+ break;
+ case G_IO_STATUS_ERROR:
+ g_warning ("Error while reading: %s", error->message);
+ g_error_free (error);
+ break;
+ case G_IO_STATUS_AGAIN:
+ /* FIXME: Try again a few times, but really, it never happens, right? */
+ break;
+ }
+ }
+
+ g_io_channel_unref (channel);
+ g_markup_parse_context_free (ctx);
+
+ if (parser.current_provider) {
+ g_warning ("pending current provider");
+ nma_mobile_provider_unref (parser.current_provider);
+ }
+
+ if (parser.current_providers) {
+ g_warning ("pending current providers");
+ provider_list_free (parser.current_providers);
+ }
+
+ g_free (parser.current_country);
+ g_free (parser.text_buffer);
out:
- return parser.table;
+ return parser.table;
}
static void
dump_generic (NMAMobileAccessMethod *method)
{
- GSList *iter;
- GString *dns;
+ GSList *iter;
+ GString *dns;
- g_print (" username: %s\n", method->username ? method->username : "");
- g_print (" password: %s\n", method->password ? method->password : "");
+ g_print (" username: %s\n", method->username ? method->username : "");
+ g_print (" password: %s\n", method->password ? method->password : "");
- dns = g_string_new (NULL);
- for (iter = method->dns; iter; iter = g_slist_next (iter))
- g_string_append_printf (dns, "%s%s", dns->len ? ", " : "", (char *) iter->data);
- g_print (" dns : %s\n", dns->str);
- g_string_free (dns, TRUE);
+ dns = g_string_new (NULL);
+ for (iter = method->dns; iter; iter = g_slist_next (iter))
+ g_string_append_printf (dns, "%s%s", dns->len ? ", " : "", (char *) iter->data);
+ g_print (" dns : %s\n", dns->str);
+ g_string_free (dns, TRUE);
- g_print (" gateway : %s\n", method->gateway ? method->gateway : "");
+ g_print (" gateway : %s\n", method->gateway ? method->gateway : "");
}
static void
dump_cdma (NMAMobileAccessMethod *method)
{
- g_print (" CDMA: %s\n", method->name);
+ g_print (" CDMA: %s\n", method->name);
- dump_generic (method);
+ dump_generic (method);
}
static void
dump_3gpp (NMAMobileAccessMethod *method)
{
- g_print (" APN: %s (%s)\n", method->name, method->apn);
+ g_print (" APN: %s (%s)\n", method->name, method->apn);
- dump_generic (method);
+ dump_generic (method);
}
static void
dump_country (gpointer key, gpointer value, gpointer user_data)
{
- GSList *miter, *citer;
- NMACountryInfo *country_info = value;
-
- g_print ("Country: %s (%s)\n",
- country_info->country_code,
- country_info->country_name);
-
- for (citer = country_info->providers; citer; citer = g_slist_next (citer)) {
- NMAMobileProvider *provider = citer->data;
-
- g_print (" Provider: %s (%s)\n", provider->name, (const char *) key);
- for (miter = provider->methods; miter; miter = g_slist_next (miter)) {
- NMAMobileAccessMethod *method = miter->data;
- GSList *liter;
-
-
- for (liter = provider->mcc_mnc; liter; liter = g_slist_next (liter)) {
- NMAMccMnc *m = liter->data;
- g_print (" MCC/MNC: %s-%s\n", m->mcc, m->mnc);
- }
-
- for (liter = provider->cdma_sid; liter; liter = g_slist_next (liter))
- g_print (" SID: %d\n", GPOINTER_TO_UINT (liter->data));
-
- switch (method->family) {
- case NMA_MOBILE_FAMILY_CDMA:
- dump_cdma (method);
- break;
- case NMA_MOBILE_FAMILY_3GPP:
- dump_3gpp (method);
- break;
- default:
- break;
- }
- g_print ("\n");
- }
- }
+ GSList *miter, *citer;
+ NMACountryInfo *country_info = value;
+
+ g_print ("Country: %s (%s)\n",
+ country_info->country_code,
+ country_info->country_name);
+
+ for (citer = country_info->providers; citer; citer = g_slist_next (citer)) {
+ NMAMobileProvider *provider = citer->data;
+
+ g_print (" Provider: %s (%s)\n", provider->name, (const char *) key);
+ for (miter = provider->methods; miter; miter = g_slist_next (miter)) {
+ NMAMobileAccessMethod *method = miter->data;
+ GSList *liter;
+
+
+ for (liter = provider->mcc_mnc; liter; liter = g_slist_next (liter)) {
+ NMAMccMnc *m = liter->data;
+ g_print (" MCC/MNC: %s-%s\n", m->mcc, m->mnc);
+ }
+
+ for (liter = provider->cdma_sid; liter; liter = g_slist_next (liter))
+ g_print (" SID: %d\n", GPOINTER_TO_UINT (liter->data));
+
+ switch (method->family) {
+ case NMA_MOBILE_FAMILY_CDMA:
+ dump_cdma (method);
+ break;
+ case NMA_MOBILE_FAMILY_3GPP:
+ dump_3gpp (method);
+ break;
+ default:
+ break;
+ }
+ g_print ("\n");
+ }
+ }
}
void
nma_mobile_providers_dump (GHashTable *country_infos)
{
- g_return_if_fail (country_infos != NULL);
- g_hash_table_foreach (country_infos, dump_country, NULL);
+ g_return_if_fail (country_infos != NULL);
+ g_hash_table_foreach (country_infos, dump_country, NULL);
}
/**
@@ -1105,7 +1105,7 @@ nma_mobile_providers_dump (GHashTable *country_infos)
* Returns: (transfer none): a #NMAMobileProvider.
*/
NMAMobileProvider *
-nma_mobile_providers_find_for_3gpp_mcc_mnc (GHashTable *country_infos,
+nma_mobile_providers_find_for_3gpp_mcc_mnc (GHashTable *country_infos,
const gchar *mccmnc)
{
GHashTableIter iter;
@@ -1165,7 +1165,7 @@ nma_mobile_providers_find_for_3gpp_mcc_mnc (GHashTable *country_infos,
* Returns: (transfer none): a #NMAMobileProvider.
*/
NMAMobileProvider *
-nma_mobile_providers_find_for_cdma_sid (GHashTable *country_infos,
+nma_mobile_providers_find_for_cdma_sid (GHashTable *country_infos,
guint32 sid)
{
GHashTableIter iter;
diff --git a/src/libnm-gtk/nm-mobile-providers.h b/src/libnm-gtk/nm-mobile-providers.h
index 5d54ef0..e77c3e8 100644
--- a/src/libnm-gtk/nm-mobile-providers.h
+++ b/src/libnm-gtk/nm-mobile-providers.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
