colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: add index to CIND helper

Browse Source
This commit is contained in:
Dan Williams
2010-11-28 21:34:00 -06:00
parent 9479c04aec
commit 2dd59c3ddd
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mm-modem-helpers.c
View File

@@ -888,17 +888,19 @@ mm_create_device_identifier (guint vid,
struct CindResponse {
char *desc;
gint idx;
gint min;
gint max;
};
static CindResponse *
cind_response_new (const char *desc, gint min, gint max)
cind_response_new (const char *desc, gint idx, gint min, gint max)
{
CindResponse *r;
char *p;
g_return_val_if_fail (desc != NULL, NULL);
g_return_val_if_fail (idx >= 0, NULL);
r = g_malloc0 (sizeof (CindResponse));
@@ -910,6 +912,7 @@ cind_response_new (const char *desc, gint min, gint max)
desc++;
}
r->idx = idx;
r->max = max;
r->min = min;
return r;
@@ -933,10 +936,18 @@ cind_response_get_desc (CindResponse *r)
return r->desc;
}
gint
cind_response_get_index (CindResponse *r)
{
g_return_val_if_fail (r != NULL, -1);
return r->idx;
}
gint
cind_response_get_min (CindResponse *r)
{
g_return_val_if_fail (r != NULL, 0);
g_return_val_if_fail (r != NULL, -1);
return r->min;
}
@@ -944,7 +955,7 @@ cind_response_get_min (CindResponse *r)
gint
cind_response_get_max (CindResponse *r)
{
g_return_val_if_fail (r != NULL, 0);
g_return_val_if_fail (r != NULL, -1);
return r->max;
}
@@ -957,6 +968,7 @@ mm_parse_cind_response (const char *reply, GError **error)
GHashTable *hash;
GRegex *r;
GMatchInfo *match_info;
gint idx = 0;
g_return_val_if_fail (reply != NULL, NULL);
@@ -992,7 +1004,7 @@ mm_parse_cind_response (const char *reply, GError **error)
max = atoi (tmp);
g_free (tmp);
resp = cind_response_new (desc, min, max);
resp = cind_response_new (desc, idx++, min, max);
if (resp)
g_hash_table_insert (hash, g_strdup (resp->desc), resp);