summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-08-04 21:20:56 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-08-04 21:20:56 +0200
commit0192a461e37cef7e2d95d576b14e0cda277fa25d (patch)
tree7ea8a9e91bc0917616ed609e9da185822480b102
parent855aecc7b576a5741df3c685ccfa2b3b11cd13ce (diff)
Move error_not_supported where it is actually used
-rw-r--r--audio/headset.c7
-rw-r--r--common/error.c13
-rw-r--r--common/error.h3
3 files changed, 7 insertions, 16 deletions
diff --git a/audio/headset.c b/audio/headset.c
index 61b1745f..1ffa7456 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -145,6 +145,13 @@ struct event {
int (*callback) (struct audio_device *device, const char *buf);
};
+static DBusHandlerResult error_not_supported(DBusConnection *conn,
+ DBusMessage *msg)
+{
+ return error_common_reply(conn, msg, ERROR_INTERFACE ".NotSupported",
+ "Not supported");
+}
+
static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb,
void *user_data, unsigned int *cb_id);
static int get_records(struct audio_device *device, headset_stream_cb_t cb,
diff --git a/common/error.c b/common/error.c
index 3e97b2a9..e4d464ac 100644
--- a/common/error.c
+++ b/common/error.c
@@ -55,19 +55,6 @@ DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn, DBusMess
}
/**
- org.bluez.Error.NotSupported:
-
- The remote device does not support the expected feature.
- Examples of use: trying to connect to audio device while audio is not
- declared in device sdp record.
-*/
-DBusHandlerResult error_not_supported(DBusConnection *conn, DBusMessage *msg)
-{
- return error_common_reply(conn, msg, ERROR_INTERFACE ".NotSupported",
- "Not supported");
-}
-
-/**
org.bluez.Error.Canceled:
The operation was canceled.
diff --git a/common/error.h b/common/error.h
index 4d4236b8..b8494dfe 100644
--- a/common/error.h
+++ b/common/error.h
@@ -33,9 +33,6 @@ DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
DBusMessage *msg,
int err);
-DBusHandlerResult error_not_supported(DBusConnection *conn,
- DBusMessage *msg);
-
DBusHandlerResult error_canceled(DBusConnection *conn, DBusMessage *msg,
const char *str);