[libdmapsharing] Play with struct/enum declaration whitespace to appease gtk-doc
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Play with struct/enum declaration whitespace to appease gtk-doc
- Date: Sun, 25 Mar 2018 03:13:34 +0000 (UTC)
commit bb7ff5b6f0391e2e003096a8a9524f74b66e56be
Author: W. Michael Petullo <mike flyn org>
Date: Sat Mar 24 23:13:23 2018 -0400
Play with struct/enum declaration whitespace to appease gtk-doc
Signed-off-by: W. Michael Petullo <mike flyn org>
libdmapsharing/dmap-av-connection.h | 6 ++----
libdmapsharing/dmap-av-share.c | 3 +--
libdmapsharing/dmap-av-share.h | 6 ++----
libdmapsharing/dmap-cc.h | 3 +--
libdmapsharing/dmap-connection.c | 6 ++----
libdmapsharing/dmap-connection.h | 12 ++++--------
libdmapsharing/dmap-control-connection.h | 6 ++----
libdmapsharing/dmap-control-player.h | 6 ++----
libdmapsharing/dmap-control-share.c | 9 +++------
libdmapsharing/dmap-control-share.h | 6 ++----
libdmapsharing/dmap-gst-input-stream.h | 6 ++----
libdmapsharing/dmap-gst-mp3-input-stream.h | 6 ++----
libdmapsharing/dmap-gst-qt-input-stream.h | 6 ++----
libdmapsharing/dmap-gst-wav-input-stream.h | 6 ++----
libdmapsharing/dmap-image-connection.h | 6 ++----
libdmapsharing/dmap-image-share.c | 3 +--
libdmapsharing/dmap-image-share.h | 6 ++----
libdmapsharing/dmap-mdns-browser.h | 9 +++------
libdmapsharing/dmap-mdns-publisher-dnssd.c | 3 +--
libdmapsharing/dmap-mdns-publisher.h | 9 +++------
libdmapsharing/dmap-mdns-service.c | 3 +--
libdmapsharing/dmap-mdns-service.h | 12 ++++--------
libdmapsharing/dmap-record.h | 9 +++------
libdmapsharing/dmap-share.c | 3 +--
libdmapsharing/dmap-share.h | 9 +++------
libdmapsharing/dmap-structure.h | 10 +++-------
26 files changed, 56 insertions(+), 113 deletions(-)
---
diff --git a/libdmapsharing/dmap-av-connection.h b/libdmapsharing/dmap-av-connection.h
index 414d249..5ac25bf 100644
--- a/libdmapsharing/dmap-av-connection.h
+++ b/libdmapsharing/dmap-av-connection.h
@@ -72,13 +72,11 @@ G_BEGIN_DECLS
#define DMAP_AV_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_AV_CONNECTION,
DmapAvConnectionClass))
typedef struct DmapAvConnectionPrivate DmapAvConnectionPrivate;
-typedef struct
-{
+typedef struct {
DmapConnectionClass dmap_connection_class;
} DmapAvConnectionClass;
-typedef struct
-{
+typedef struct {
DmapConnection dmap_connection_instance;
DmapAvConnectionPrivate *priv;
} DmapAvConnection;
diff --git a/libdmapsharing/dmap-av-share.c b/libdmapsharing/dmap-av-share.c
index 69cfd91..ed55f09 100644
--- a/libdmapsharing/dmap-av-share.c
+++ b/libdmapsharing/dmap-av-share.c
@@ -203,8 +203,7 @@ dmap_av_share_server_info (DmapShare * share,
g_free (nameprop);
}
-typedef enum
-{
+typedef enum {
ITEM_ID = 0,
ITEM_NAME,
ITEM_KIND,
diff --git a/libdmapsharing/dmap-av-share.h b/libdmapsharing/dmap-av-share.h
index fcb8c4c..0c02b40 100644
--- a/libdmapsharing/dmap-av-share.h
+++ b/libdmapsharing/dmap-av-share.h
@@ -84,13 +84,11 @@ G_BEGIN_DECLS
DMAP_TYPE_AV_SHARE, DmapAvShareClass))
typedef struct DmapAvSharePrivate DmapAvSharePrivate;
-typedef struct
-{
+typedef struct {
DmapShareClass dmap_share_class;
} DmapAvShareClass;
-typedef struct
-{
+typedef struct {
DmapShare dmap_share_instance;
DmapAvSharePrivate *priv;
} DmapAvShare;
diff --git a/libdmapsharing/dmap-cc.h b/libdmapsharing/dmap-cc.h
index b9665b9..803368b 100644
--- a/libdmapsharing/dmap-cc.h
+++ b/libdmapsharing/dmap-cc.h
@@ -5,8 +5,7 @@
G_BEGIN_DECLS
-typedef enum
-{
+typedef enum {
DMAP_CC_INVALID = 0,
DMAP_RAW, /* The RAW type does not use a content code.
* Instead of:
diff --git a/libdmapsharing/dmap-connection.c b/libdmapsharing/dmap-connection.c
index feb630f..00b2bf7 100644
--- a/libdmapsharing/dmap-connection.c
+++ b/libdmapsharing/dmap-connection.c
@@ -592,8 +592,7 @@ _connection_set_error_message (DmapConnection * connection,
}
}
-typedef struct
-{
+typedef struct {
SoupMessage *message;
int status;
DmapConnection *connection;
@@ -1562,8 +1561,7 @@ dmap_connection_is_connected (DmapConnection * connection)
return connection->priv->is_connected;
}
-typedef struct
-{
+typedef struct {
DmapConnection *connection;
DmapConnectionFunc callback;
gpointer user_data;
diff --git a/libdmapsharing/dmap-connection.h b/libdmapsharing/dmap-connection.h
index 2a7ff00..1584d3a 100644
--- a/libdmapsharing/dmap-connection.h
+++ b/libdmapsharing/dmap-connection.h
@@ -31,8 +31,7 @@
G_BEGIN_DECLS
-typedef struct
-{
+typedef struct {
char *name;
int id;
GList *uris;
@@ -102,8 +101,7 @@ typedef struct DmapConnectionPrivate DmapConnectionPrivate;
*
* Enumeration of connection states.
*/
-typedef enum
-{
+typedef enum {
DMAP_GET_INFO = 0,
DMAP_LOGIN,
DMAP_GET_REVISION_NUMBER,
@@ -115,14 +113,12 @@ typedef enum
DMAP_DONE
} DmapConnectionState;
-typedef struct
-{
+typedef struct {
GObject parent;
DmapConnectionPrivate *priv;
} DmapConnection;
-typedef struct
-{
+typedef struct {
GObjectClass parent;
/* Pure virtual methods: */
diff --git a/libdmapsharing/dmap-control-connection.h b/libdmapsharing/dmap-control-connection.h
index e6ead09..ef5845c 100644
--- a/libdmapsharing/dmap-control-connection.h
+++ b/libdmapsharing/dmap-control-connection.h
@@ -72,13 +72,11 @@ G_BEGIN_DECLS
#define DMAP_CONTROL_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DACP_TYPE_CONNECTION,
DmapControlConnectionClass))
typedef struct DmapControlConnectionPrivate DmapControlConnectionPrivate;
-typedef struct
-{
+typedef struct {
DmapConnectionClass dmap_connection_class;
} DmapControlConnectionClass;
-typedef struct
-{
+typedef struct {
DmapConnection dmap_connection_instance;
DmapControlConnectionPrivate *priv;
} DmapControlConnection;
diff --git a/libdmapsharing/dmap-control-player.h b/libdmapsharing/dmap-control-player.h
index 78f75b1..6fddedb 100644
--- a/libdmapsharing/dmap-control-player.h
+++ b/libdmapsharing/dmap-control-player.h
@@ -58,15 +58,13 @@ G_BEGIN_DECLS
typedef struct _DmapControlPlayerInterface DmapControlPlayerInterface;
typedef struct _DmapControlPlayer DmapControlPlayer;
-typedef enum
-{
+typedef enum {
CONTROL_REPEAT_NONE = 0,
CONTROL_REPEAT_SINGLE = 1,
CONTROL_REPEAT_ALL = 2
} DmapControlRepeatState;
-typedef enum
-{
+typedef enum {
CONTROL_PLAY_STOPPED = 2,
CONTROL_PLAY_PAUSED = 3,
CONTROL_PLAY_PLAYING = 4
diff --git a/libdmapsharing/dmap-control-share.c b/libdmapsharing/dmap-control-share.c
index e15cf86..9bcfc2b 100644
--- a/libdmapsharing/dmap-control-share.c
+++ b/libdmapsharing/dmap-control-share.c
@@ -79,8 +79,7 @@ struct DmapControlSharePrivate
/*
* Internal representation of a DACP remote.
*/
-typedef struct
-{
+typedef struct {
gchar *host;
guint port;
gchar *pair_txt;
@@ -89,15 +88,13 @@ typedef struct
#define DMAP_CONTROL_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_CONTROL_SHARE,
DmapControlSharePrivate))
-enum
-{
+enum {
PROP_0,
PROP_LIBRARY_NAME,
PROP_PLAYER
};
-enum
-{
+enum {
REMOTE_FOUND,
REMOTE_LOST,
REMOTE_PAIRED,
diff --git a/libdmapsharing/dmap-control-share.h b/libdmapsharing/dmap-control-share.h
index cdad864..cf69553 100644
--- a/libdmapsharing/dmap-control-share.h
+++ b/libdmapsharing/dmap-control-share.h
@@ -84,14 +84,12 @@ G_BEGIN_DECLS
DMAP_TYPE_CONTROL_SHARE, DmapControlShareClass))
typedef struct DmapControlSharePrivate DmapControlSharePrivate;
-typedef struct
-{
+typedef struct {
DmapAvShare dmap_av_share_instance;
DmapControlSharePrivate *priv;
} DmapControlShare;
-typedef struct
-{
+typedef struct {
DmapAvShareClass dmap_av_share_class;
gboolean (*lookup_guid) (DmapControlShare * share, gchar * guid);
diff --git a/libdmapsharing/dmap-gst-input-stream.h b/libdmapsharing/dmap-gst-input-stream.h
index 95b2231..6aede5c 100644
--- a/libdmapsharing/dmap-gst-input-stream.h
+++ b/libdmapsharing/dmap-gst-input-stream.h
@@ -46,14 +46,12 @@ G_BEGIN_DECLS
DmapGstInputStreamClass))
typedef struct DmapGstInputStreamPrivate DmapGstInputStreamPrivate;
-typedef struct
-{
+typedef struct {
GInputStream parent;
DmapGstInputStreamPrivate *priv;
} DmapGstInputStream;
-typedef struct
-{
+typedef struct {
GInputStreamClass parent;
void (*kill_pipeline) (DmapGstInputStream *stream);
diff --git a/libdmapsharing/dmap-gst-mp3-input-stream.h b/libdmapsharing/dmap-gst-mp3-input-stream.h
index cb4c592..223caa9 100644
--- a/libdmapsharing/dmap-gst-mp3-input-stream.h
+++ b/libdmapsharing/dmap-gst-mp3-input-stream.h
@@ -47,14 +47,12 @@ G_BEGIN_DECLS
DmapGstMP3InputStreamPrivate))
typedef struct DmapGstMP3InputStreamPrivate DmapGstMP3InputStreamPrivate;
-typedef struct
-{
+typedef struct {
DmapGstInputStream parent;
DmapGstMP3InputStreamPrivate *priv;
} DmapGstMP3InputStream;
-typedef struct
-{
+typedef struct {
DmapGstInputStreamClass parent;
} DmapGstMP3InputStreamClass;
diff --git a/libdmapsharing/dmap-gst-qt-input-stream.h b/libdmapsharing/dmap-gst-qt-input-stream.h
index 287ac1b..bf234a2 100644
--- a/libdmapsharing/dmap-gst-qt-input-stream.h
+++ b/libdmapsharing/dmap-gst-qt-input-stream.h
@@ -47,14 +47,12 @@ G_BEGIN_DECLS
DmapGstQtInputStreamPrivate))
typedef struct DmapGstQtInputStreamPrivate DmapGstQtInputStreamPrivate;
-typedef struct
-{
+typedef struct {
DmapGstInputStream parent;
DmapGstQtInputStreamPrivate *priv;
} DmapGstQtInputStream;
-typedef struct
-{
+typedef struct {
DmapGstInputStreamClass parent;
} DmapGstQtInputStreamClass;
diff --git a/libdmapsharing/dmap-gst-wav-input-stream.h b/libdmapsharing/dmap-gst-wav-input-stream.h
index 9025f7e..9f9117b 100644
--- a/libdmapsharing/dmap-gst-wav-input-stream.h
+++ b/libdmapsharing/dmap-gst-wav-input-stream.h
@@ -47,14 +47,12 @@ G_BEGIN_DECLS
DmapGstWavInputStreamPrivate))
typedef struct DmapGstWavInputStreamPrivate DmapGstWavInputStreamPrivate;
-typedef struct
-{
+typedef struct {
DmapGstInputStream parent;
DmapGstWavInputStreamPrivate *priv;
} DmapGstWavInputStream;
-typedef struct
-{
+typedef struct {
DmapGstInputStreamClass parent;
} DmapGstWavInputStreamClass;
diff --git a/libdmapsharing/dmap-image-connection.h b/libdmapsharing/dmap-image-connection.h
index 3b9b9f1..0a96b53 100644
--- a/libdmapsharing/dmap-image-connection.h
+++ b/libdmapsharing/dmap-image-connection.h
@@ -72,13 +72,11 @@ G_BEGIN_DECLS
#define DMAP_IMAGE_CONNECTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_IMAGE_CONNECTION,
DmapImageConnectionClass))
typedef struct DmapImageConnectionPrivate DmapImageConnectionPrivate;
-typedef struct
-{
+typedef struct {
DmapConnectionClass dmap_connection_class;
} DmapImageConnectionClass;
-typedef struct
-{
+typedef struct {
DmapConnection dmap_connection_instance;
DmapImageConnectionPrivate *priv;
} DmapImageConnection;
diff --git a/libdmapsharing/dmap-image-share.c b/libdmapsharing/dmap-image-share.c
index 7bda402..b188e70 100644
--- a/libdmapsharing/dmap-image-share.c
+++ b/libdmapsharing/dmap-image-share.c
@@ -63,8 +63,7 @@ struct DmapImageSharePrivate
gchar unused;
};
-typedef enum
-{
+typedef enum {
ITEM_ID = 0,
ITEM_NAME,
ITEM_KIND,
diff --git a/libdmapsharing/dmap-image-share.h b/libdmapsharing/dmap-image-share.h
index 701a630..623d304 100644
--- a/libdmapsharing/dmap-image-share.h
+++ b/libdmapsharing/dmap-image-share.h
@@ -81,13 +81,11 @@ G_BEGIN_DECLS
DMAP_TYPE_IMAGE_SHARE, DmapImageShareClass))
typedef struct DmapImageSharePrivate DmapImageSharePrivate;
-typedef struct
-{
+typedef struct {
DmapShareClass dmap_share_class;
} DmapImageShareClass;
-typedef struct
-{
+typedef struct {
DmapShare dmap_share_instance;
DmapImageSharePrivate *priv;
} DmapImageShare;
diff --git a/libdmapsharing/dmap-mdns-browser.h b/libdmapsharing/dmap-mdns-browser.h
index ee4b415..c472431 100644
--- a/libdmapsharing/dmap-mdns-browser.h
+++ b/libdmapsharing/dmap-mdns-browser.h
@@ -77,21 +77,18 @@ G_BEGIN_DECLS
typedef struct _DmapMdnsBrowserPrivate DmapMdnsBrowserPrivate;
-typedef enum
-{
+typedef enum {
DMAP_MDNS_BROWSER_ERROR_NOT_RUNNING = 0,
DMAP_MDNS_BROWSER_ERROR_FAILED,
} DmapMdnsBrowserError;
-typedef struct
-{
+typedef struct {
GObject object;
DmapMdnsBrowserPrivate *priv;
} DmapMdnsBrowser;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
void (*service_added) (DmapMdnsBrowser *browser,
diff --git a/libdmapsharing/dmap-mdns-publisher-dnssd.c b/libdmapsharing/dmap-mdns-publisher-dnssd.c
index 27ab366..f3f10fe 100644
--- a/libdmapsharing/dmap-mdns-publisher-dnssd.c
+++ b/libdmapsharing/dmap-mdns-publisher-dnssd.c
@@ -28,8 +28,7 @@
#define DMAP_MDNS_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DMAP_TYPE_MDNS_PUBLISHER,
DmapMdnsPublisherPrivate))
-struct DmapMdnsPublisherPrivate
-{
+struct DmapMdnsPublisherPrivate {
DNSServiceRef sdref;
char *name;
};
diff --git a/libdmapsharing/dmap-mdns-publisher.h b/libdmapsharing/dmap-mdns-publisher.h
index c748159..e756a33 100644
--- a/libdmapsharing/dmap-mdns-publisher.h
+++ b/libdmapsharing/dmap-mdns-publisher.h
@@ -36,15 +36,13 @@ G_BEGIN_DECLS
#define DMAP_MDNS_PUBLISHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), DMAP_TYPE_MDNS_PUBLISHER,
DmapMdnsPublisherClass))
typedef struct DmapMdnsPublisherPrivate DmapMdnsPublisherPrivate;
-typedef struct
-{
+typedef struct {
GObject object;
DmapMdnsPublisherPrivate *priv;
} DmapMdnsPublisher;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
void (*published) (DmapMdnsPublisher * publisher, const char *name);
@@ -52,8 +50,7 @@ typedef struct
const char *name);
} DmapMdnsPublisherClass;
-typedef enum
-{
+typedef enum {
DMAP_MDNS_PUBLISHER_ERROR_NOT_RUNNING,
DMAP_MDNS_PUBLISHER_ERROR_FAILED,
} DmapMdnsPublisherError;
diff --git a/libdmapsharing/dmap-mdns-service.c b/libdmapsharing/dmap-mdns-service.c
index 64ed117..4552472 100644
--- a/libdmapsharing/dmap-mdns-service.c
+++ b/libdmapsharing/dmap-mdns-service.c
@@ -30,8 +30,7 @@
#include <glib/gi18n.h>
#include <glib-object.h>
-struct _DmapMdnsServicePrivate
-{
+struct _DmapMdnsServicePrivate {
gchar *service_name;
gchar *name;
gchar *host;
diff --git a/libdmapsharing/dmap-mdns-service.h b/libdmapsharing/dmap-mdns-service.h
index a2c0da6..0aacc40 100644
--- a/libdmapsharing/dmap-mdns-service.h
+++ b/libdmapsharing/dmap-mdns-service.h
@@ -84,8 +84,7 @@ typedef struct _DmapMdnsServicePrivate DmapMdnsServicePrivate;
* Enum values used to specify the service type.
*
*/
-typedef enum
-{
+typedef enum {
DMAP_MDNS_SERVICE_TYPE_INVALID = 0,
DMAP_MDNS_SERVICE_TYPE_DAAP,
DMAP_MDNS_SERVICE_TYPE_DPAP,
@@ -96,8 +95,7 @@ typedef enum
// FIXME: this is only for RAOP and corresponds to the "tp" txt record.
// This should be in a sub-class.
-typedef enum
-{
+typedef enum {
DMAP_MDNS_SERVICE_TRANSPORT_PROTOCOL_TCP = 0,
DMAP_MDNS_SERVICE_TRANSPORT_PROTOCOL_UDP,
DMAP_MDNS_SERVICE_TRANSPORT_PROTOCOL_LAST = DMAP_MDNS_SERVICE_TRANSPORT_PROTOCOL_UDP
@@ -111,13 +109,11 @@ static const char * const _service_type_name[] = {
"_raop._tcp"
};
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
} DmapMdnsServiceClass;
-typedef struct
-{
+typedef struct {
GObject object;
DmapMdnsServicePrivate *priv;
diff --git a/libdmapsharing/dmap-record.h b/libdmapsharing/dmap-record.h
index 382dc20..0938f52 100644
--- a/libdmapsharing/dmap-record.h
+++ b/libdmapsharing/dmap-record.h
@@ -59,18 +59,15 @@ G_BEGIN_DECLS
#define DMAP_RECORD_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), \
DMAP_TYPE_RECORD, DmapRecordInterface))
typedef struct _DmapRecord DmapRecord;
-typedef struct _DmapRecordInterface DmapRecordInterface;
-struct _DmapRecordInterface
-{
+typedef struct {
GTypeInterface parent;
GArray *(*to_blob) (DmapRecord * record);
gboolean (*set_from_blob) (DmapRecord * record, GArray * blob);
-};
+} DmapRecordInterface;
-typedef enum
-{
+typedef enum {
DMAP_MEDIA_KIND_MUSIC = 1,
DMAP_MEDIA_KIND_MOVIE = 2,
DMAP_MEDIA_KIND_PODCAST = 32,
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index 02d4942..00092dc 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -1446,8 +1446,7 @@ dmap_share_free_filter (GSList * filter)
}
}
-typedef struct
-{
+typedef struct {
gchar *name;
gint64 group_id;
gchar *artist;
diff --git a/libdmapsharing/dmap-share.h b/libdmapsharing/dmap-share.h
index c2d489e..c808ef3 100644
--- a/libdmapsharing/dmap-share.h
+++ b/libdmapsharing/dmap-share.h
@@ -90,23 +90,20 @@ G_BEGIN_DECLS
#define DMAP_STATUS_OK 200
typedef struct DmapSharePrivate DmapSharePrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
DmapSharePrivate *priv;
} DmapShare;
typedef struct DmapMetaDataMap DmapMetaDataMap;
-typedef enum
-{
+typedef enum {
DMAP_SHARE_AUTH_METHOD_NONE = 0,
DMAP_SHARE_AUTH_METHOD_NAME_AND_PASSWORD = 1,
DMAP_SHARE_AUTH_METHOD_PASSWORD = 2
} DmapShareAuthMethod;
-typedef struct
-{
+typedef struct {
GObjectClass parent;
/* Pure virtual methods: */
diff --git a/libdmapsharing/dmap-structure.h b/libdmapsharing/dmap-structure.h
index 163dcd4..52ecb92 100644
--- a/libdmapsharing/dmap-structure.h
+++ b/libdmapsharing/dmap-structure.h
@@ -47,8 +47,7 @@ guint dmap_structure_get_size (GNode * structure);
void dmap_structure_increase_by_predicted_size (GNode * structure,
guint size);
-typedef enum
-{
+typedef enum {
DMAP_TYPE_BYTE = 0x0001,
DMAP_TYPE_SIGNED_INT = 0x0002,
DMAP_TYPE_SHORT = 0x0003,
@@ -62,16 +61,13 @@ typedef enum
DMAP_TYPE_INVALID = 0xFFFF
} DmapType;
-typedef struct _DmapContentCodeDefinition DmapContentCodeDefinition;
-
-struct _DmapContentCodeDefinition
-{
+typedef struct {
DmapContentCode code;
gint32 int_code;
const gchar *name;
const gchar *string;
DmapType type;
-};
+} DmapContentCodeDefinition;
const DmapContentCodeDefinition * dmap_structure_content_codes (guint * number);
gint32 dmap_structure_cc_string_as_int32 (const gchar * str);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]