diff options
| author | Chris Kuethe <chris.kuethe@gmail.com> | 2009-07-19 06:22:20 +0000 |
|---|---|---|
| committer | Chris Kuethe <chris.kuethe@gmail.com> | 2009-07-19 06:22:20 +0000 |
| commit | 6172e60b20541cf966de361608fb94ed6ed91a4e (patch) | |
| tree | 8023ee2aceca958d22e56d2cc87c918145140c1c /gpsd_dbus.c | |
| parent | 9575e7f20075250f0455c7a8ae48adf711329eba (diff) | |
| download | gpsd-6172e60b20541cf966de361608fb94ed6ed91a4e.tar.gz | |
don't shadow the devname() stdlib function
Diffstat (limited to 'gpsd_dbus.c')
| -rw-r--r-- | gpsd_dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpsd_dbus.c b/gpsd_dbus.c index e8ffb202..692da9f4 100644 --- a/gpsd_dbus.c +++ b/gpsd_dbus.c @@ -31,14 +31,14 @@ void send_dbus_fix(struct gps_device_t* channel) { DBusMessage* message; /*DBusMessageIter iter;*/ dbus_uint32_t serial; /* collected, but not used */ - char* devname; + char* gpsd_devname; /* if the connection is non existent, return without doing anything */ if (connection == NULL) return; gpsdata = &(channel->gpsdata); gpsfix = &(gpsdata->fix); - devname = gpsdata->gps_device; + gpsd_devname = gpsdata->gps_device; /* Send the named signel. */ message = dbus_message_new_signal("/org/gpsd", "org.gpsd", "fix"); @@ -57,7 +57,7 @@ void send_dbus_fix(struct gps_device_t* channel) { DBUS_TYPE_DOUBLE, &(gpsfix->eps), DBUS_TYPE_DOUBLE, &(gpsfix->climb), DBUS_TYPE_DOUBLE, &(gpsfix->epc), - DBUS_TYPE_STRING, &devname, + DBUS_TYPE_STRING, &gpsd_devname, DBUS_TYPE_INVALID); dbus_message_set_no_reply(message, TRUE); dbus_connection_send(connection, message, &serial); |