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

core: strip "0x" off udev ID_VENDOR_ID and ID_MODEL_ID strings

Browse Source
This commit is contained in:
Dan Williams
2010-10-22 11:14:34 -05:00
parent 7ae8ffe21b
commit 7c410a8d08
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-plugin-base.c
+12 -2
View File
@@ -922,7 +922,11 @@ mm_plugin_base_get_device_ids (MMPluginBase *self,
}
vid = g_udev_device_get_property (device, "ID_VENDOR_ID");
if (!vid || (strlen (vid) != 4))
if (!vid)
goto out;
if (strncmp (vid, "0x", 2) == 0)
vid += 2;
if (strlen (vid) != 4)
goto out;
if (vendor) {
@@ -931,7 +935,13 @@ mm_plugin_base_get_device_ids (MMPluginBase *self,
}
pid = g_udev_device_get_property (device, "ID_MODEL_ID");
if (!pid || (strlen (pid) != 4)) {
if (!pid) {
*vendor = 0;
goto out;
}
if (strncmp (pid, "0x", 2) == 0)
pid += 2;
if (strlen (pid) != 4) {
*vendor = 0;
goto out;
}