From 42e79295674350e519c2a3d380f875a36e9834e4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 4 Jan 2013 12:23:54 -0800 Subject: [PATCH] profiles: Remove the total silly usage of gchar and replace it with char --- profiles/audio/manager.c | 12 ++++++------ profiles/cups/main.c | 6 +++--- profiles/cyclingspeed/cyclingspeed.c | 4 ++-- profiles/health/hdp.c | 2 +- profiles/heartrate/heartrate.c | 4 ++-- profiles/input/hog.c | 2 +- profiles/input/manager.c | 4 ++-- profiles/input/suspend-dummy.c | 2 +- profiles/network/manager.c | 12 ++++++------ profiles/thermometer/thermometer.c | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c index b137f282a..8cf4b61b7 100644 --- a/profiles/audio/manager.c +++ b/profiles/audio/manager.c @@ -170,7 +170,7 @@ static int avrcp_probe(struct btd_profile *p, struct btd_device *device, static int a2dp_source_connect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); @@ -187,7 +187,7 @@ static int a2dp_source_connect(struct btd_device *dev, static int a2dp_source_disconnect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); @@ -204,7 +204,7 @@ static int a2dp_source_disconnect(struct btd_device *dev, static int a2dp_sink_connect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); @@ -221,7 +221,7 @@ static int a2dp_sink_connect(struct btd_device *dev, static int a2dp_sink_disconnect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); @@ -238,7 +238,7 @@ static int a2dp_sink_disconnect(struct btd_device *dev, static int avrcp_control_connect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); @@ -255,7 +255,7 @@ static int avrcp_control_connect(struct btd_device *dev, static int avrcp_control_disconnect(struct btd_device *dev, struct btd_profile *profile) { - const gchar *path = device_get_path(dev); + const char *path = device_get_path(dev); struct audio_device *audio_dev; DBG("path %s", path); diff --git a/profiles/cups/main.c b/profiles/cups/main.c index f990b93ba..2079812fa 100644 --- a/profiles/cups/main.c +++ b/profiles/cups/main.c @@ -63,9 +63,9 @@ struct context_data { }; static void element_start(GMarkupParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, gpointer user_data, GError **err) { struct context_data *ctx_data = user_data; diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c index 941b593c0..f01613197 100644 --- a/profiles/cyclingspeed/cyclingspeed.c +++ b/profiles/cyclingspeed/cyclingspeed.c @@ -144,7 +144,7 @@ static const char * const location_enum[] = { "rear-dropout", "chainstay", "rear-wheel", "rear-hub" }; -static const gchar *location2str(uint8_t value) +static const char *location2str(uint8_t value) { if (value < G_N_ELEMENTS(location_enum)) return location_enum[value]; @@ -513,7 +513,7 @@ static void update_watcher(gpointer data, gpointer user_data) struct watcher *w = data; struct measurement *m = user_data; struct csc *csc = m->csc; - const gchar *path = device_get_path(csc->dev); + const char *path = device_get_path(csc->dev); DBusMessageIter iter; DBusMessageIter dict; DBusMessage *msg; diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c index e63742005..44448c438 100644 --- a/profiles/health/hdp.c +++ b/profiles/health/hdp.c @@ -2124,7 +2124,7 @@ static const GDBusPropertyTable health_device_properties[] = { static struct hdp_device *create_health_device(struct btd_device *device) { struct btd_adapter *adapter = device_get_adapter(device); - const gchar *path = device_get_path(device); + const char *path = device_get_path(device); struct hdp_device *dev; GSList *l; diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c index 7ee93251d..bc986836c 100644 --- a/profiles/heartrate/heartrate.c +++ b/profiles/heartrate/heartrate.c @@ -104,7 +104,7 @@ static const char * const location_enum[] = { "foot", }; -static const gchar *location2str(uint8_t value) +static const char *location2str(uint8_t value) { if (value < G_N_ELEMENTS(location_enum)) return location_enum[value]; @@ -265,7 +265,7 @@ static void update_watcher(gpointer data, gpointer user_data) struct watcher *w = data; struct measurement *m = user_data; struct heartrate *hr = m->hr; - const gchar *path = device_get_path(hr->dev); + const char *path = device_get_path(hr->dev); DBusMessageIter iter; DBusMessageIter dict; DBusMessage *msg; diff --git a/profiles/input/hog.c b/profiles/input/hog.c index a9018f557..7f13abc1b 100644 --- a/profiles/input/hog.c +++ b/profiles/input/hog.c @@ -865,7 +865,7 @@ static void remove_device(gpointer a, gpointer b) static void hog_remove(struct btd_profile *p, struct btd_device *device) { - const gchar *path = device_get_path(device); + const char *path = device_get_path(device); DBG("path %s", path); diff --git a/profiles/input/manager.c b/profiles/input/manager.c index 145f8a0e7..a06edd26e 100644 --- a/profiles/input/manager.c +++ b/profiles/input/manager.c @@ -47,7 +47,7 @@ static int idle_timeout = 0; static void input_remove(struct btd_device *device, const char *uuid) { - const gchar *path = device_get_path(device); + const char *path = device_get_path(device); DBG("path %s", path); @@ -57,7 +57,7 @@ static void input_remove(struct btd_device *device, const char *uuid) static int hid_device_probe(struct btd_profile *p, struct btd_device *device, GSList *uuids) { - const gchar *path = device_get_path(device); + const char *path = device_get_path(device); const sdp_record_t *rec = btd_device_get_record(device, uuids->data); DBG("path %s", path); diff --git a/profiles/input/suspend-dummy.c b/profiles/input/suspend-dummy.c index 4c56c842c..75dd536de 100644 --- a/profiles/input/suspend-dummy.c +++ b/profiles/input/suspend-dummy.c @@ -50,7 +50,7 @@ static int fifo_open(void); static gboolean read_fifo(GIOChannel *io, GIOCondition cond, gpointer user_data) { - gchar buffer[12]; + char buffer[12]; gsize offset, left, bread; GIOStatus iostatus; diff --git a/profiles/network/manager.c b/profiles/network/manager.c index ffab55ba3..79517d09e 100644 --- a/profiles/network/manager.c +++ b/profiles/network/manager.c @@ -101,7 +101,7 @@ static int panu_disconnect(struct btd_device *dev, struct btd_profile *profile) static int panu_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); @@ -111,7 +111,7 @@ static int panu_server_probe(struct btd_profile *p, struct btd_adapter *adapter) static void panu_server_remove(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); @@ -138,7 +138,7 @@ static int gn_disconnect(struct btd_device *dev, struct btd_profile *profile) static int gn_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); @@ -148,7 +148,7 @@ static int gn_server_probe(struct btd_profile *p, struct btd_adapter *adapter) static void gn_server_remove(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); @@ -175,7 +175,7 @@ static int nap_disconnect(struct btd_device *dev, struct btd_profile *profile) static int nap_server_probe(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); @@ -185,7 +185,7 @@ static int nap_server_probe(struct btd_profile *p, struct btd_adapter *adapter) static void nap_server_remove(struct btd_profile *p, struct btd_adapter *adapter) { - const gchar *path = adapter_get_path(adapter); + const char *path = adapter_get_path(adapter); DBG("path %s", path); diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 074bd4a5a..2a07eac2a 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -133,7 +133,7 @@ static const char * const temp_type[] = { "tympanum" }; -static const gchar *temptype2str(uint8_t value) +static const char *temptype2str(uint8_t value) { if (value > 0 && value < G_N_ELEMENTS(temp_type)) return temp_type[value]; @@ -277,7 +277,7 @@ static void update_watcher(gpointer data, gpointer user_data) { struct watcher *w = data; struct measurement *m = user_data; - const gchar *path = device_get_path(m->t->dev); + const char *path = device_get_path(m->t->dev); DBusMessageIter iter; DBusMessageIter dict; DBusMessage *msg; @@ -1164,7 +1164,7 @@ static void attio_disconnected_cb(gpointer user_data) static int thermometer_register(struct btd_device *device, struct gatt_primary *tattr) { - const gchar *path = device_get_path(device); + const char *path = device_get_path(device); struct thermometer *t; struct btd_adapter *adapter; struct thermometer_adapter *tadapter; -- 2.47.3