diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-02-24 14:33:28 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-02-24 15:27:58 +0000 |
| commit | 982746258bf8acad13e1a8258cc9a228fb7ef936 (patch) | |
| tree | 03804ed8000f31d7bb2f49acc80577ce7406f265 /osinfo/osinfo_os.c | |
| parent | 76988a72c00565e90299f3b1ba867136d2bd2af7 (diff) | |
| download | libosinfo-982746258bf8acad13e1a8258cc9a228fb7ef936.tar.gz | |
Rename 'link' variables to avoid clash with global symbol
Diffstat (limited to 'osinfo/osinfo_os.c')
| -rw-r--r-- | osinfo/osinfo_os.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/osinfo/osinfo_os.c b/osinfo/osinfo_os.c index 4954024..a89194a 100644 --- a/osinfo/osinfo_os.c +++ b/osinfo/osinfo_os.c @@ -185,8 +185,8 @@ OsinfoDeviceList *osinfo_os_get_devices(OsinfoOs *os, OsinfoFilter *filter) tmp = os->priv->deviceLinks; while (tmp) { - OsinfoDeviceLink *link = OSINFO_DEVICELINK(tmp->data); - OsinfoDevice *dev = osinfo_devicelink_get_target(link); + OsinfoDeviceLink *devlink = OSINFO_DEVICELINK(tmp->data); + OsinfoDevice *dev = osinfo_devicelink_get_target(devlink); if (!filter || osinfo_filter_matches(filter, OSINFO_ENTITY(dev))) osinfo_list_add(OSINFO_LIST(newList), OSINFO_ENTITY(dev)); @@ -295,10 +295,10 @@ OsinfoDeviceLinkList *osinfo_os_get_device_links(OsinfoOs *os, OsinfoFilter *fil tmp = os->priv->deviceLinks; while (tmp) { - OsinfoDeviceLink *link = OSINFO_DEVICELINK(tmp->data); + OsinfoDeviceLink *devlink = OSINFO_DEVICELINK(tmp->data); - if (!filter || osinfo_filter_matches(filter, OSINFO_ENTITY(link))) - osinfo_list_add(OSINFO_LIST(newList), OSINFO_ENTITY(link)); + if (!filter || osinfo_filter_matches(filter, OSINFO_ENTITY(devlink))) + osinfo_list_add(OSINFO_LIST(newList), OSINFO_ENTITY(devlink)); tmp = tmp->next; } @@ -323,11 +323,11 @@ OsinfoDeviceLink *osinfo_os_add_device(OsinfoOs *os, OsinfoDevice *dev) g_return_val_if_fail(OSINFO_IS_OS(os), NULL); g_return_val_if_fail(OSINFO_IS_DEVICE(dev), NULL); - OsinfoDeviceLink *link = osinfo_devicelink_new(dev); + OsinfoDeviceLink *devlink = osinfo_devicelink_new(dev); - os->priv->deviceLinks = g_list_append(os->priv->deviceLinks, link); + os->priv->deviceLinks = g_list_append(os->priv->deviceLinks, devlink); - return link; + return devlink; } /** |