From 5f4d5583631c0f47a08231b71941b87e49d476e5 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 24 Mar 2010 19:26:09 +0200 Subject: [PATCH] core cleanup: rename core & backend API headers In reflection it probably won't make any sense to split the APIs to several headers. One for each should be enough. Also removed duplicate SIPE_UNUSED_PARAMETER definition from sip-sec.h. --- src/api/Makefile.am | 4 ++-- src/api/{sipe-backend-debug.h => sipe-backend.h} | 4 +++- src/api/sipe-common.h | 7 +++++++ src/api/{sipe-core-api.h => sipe-core.h} | 2 +- src/core/http-conn.c | 1 + src/core/sip-csta.c | 2 +- src/core/sip-sec-krb5.c | 1 + src/core/sip-sec.c | 3 ++- src/core/sip-sec.h | 4 +--- src/core/sipe-cal.c | 2 +- src/core/sipe-chat.c | 2 +- src/core/sipe-conf.c | 1 + src/core/sipe-dialog.c | 2 +- src/core/sipe-ews.c | 3 ++- src/core/sipe-ft.c | 1 + src/core/sipe-mime.c | 2 +- src/core/sipe-session.c | 2 +- src/core/sipe-sign.c | 2 +- src/core/sipe-utils.c | 2 +- src/core/sipe-xml-tests.c | 2 +- src/core/sipe-xml.c | 2 +- src/core/sipe.c | 4 ++-- src/purple/purple-debug.c | 2 +- src/purple/purple-plugin.c | 2 +- 24 files changed, 36 insertions(+), 23 deletions(-) rename src/api/{sipe-backend-debug.h => sipe-backend.h} (95%) rename src/api/{sipe-core-api.h => sipe-core.h} (97%) diff --git a/src/api/Makefile.am b/src/api/Makefile.am index 8fb02896..b624e8e4 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = \ Makefile.in EXTRA_DIST = \ - sipe-backend-debug.h \ + sipe-backend.h \ sipe-common.h \ - sipe-core-api.h \ + sipe-core.h \ sipe-nls.h diff --git a/src/api/sipe-backend-debug.h b/src/api/sipe-backend.h similarity index 95% rename from src/api/sipe-backend-debug.h rename to src/api/sipe-backend.h index cdc3e26a..d1e89b2c 100644 --- a/src/api/sipe-backend-debug.h +++ b/src/api/sipe-backend.h @@ -1,5 +1,5 @@ /** - * @file sipe-backend-debug.h + * @file sipe-backend.h * * pidgin-sipe * @@ -20,6 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/** DEBUGGING ****************************************************************/ + typedef enum { SIPE_DEBUG_LEVEL_INFO, SIPE_DEBUG_LEVEL_WARNING, diff --git a/src/api/sipe-common.h b/src/api/sipe-common.h index 3f487adc..e8b0b3c6 100644 --- a/src/api/sipe-common.h +++ b/src/api/sipe-common.h @@ -20,6 +20,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* + * Everything in here must be independent of any other header file! + * + * I.e. it must be possible to include this header + * in any module without requiring any other #include. + */ + #define SIPE_UNUSED_PARAMETER __attribute__((unused)) /* in order to remove internal.h dependency in mingw builds */ diff --git a/src/api/sipe-core-api.h b/src/api/sipe-core.h similarity index 97% rename from src/api/sipe-core-api.h rename to src/api/sipe-core.h index 005d2959..b71da41c 100644 --- a/src/api/sipe-core-api.h +++ b/src/api/sipe-core.h @@ -1,5 +1,5 @@ /** - * @file sipe-core-api.h + * @file sipe-core.h * * pidgin-sipe * diff --git a/src/core/http-conn.c b/src/core/http-conn.c index d4876d49..62fe96eb 100644 --- a/src/core/http-conn.c +++ b/src/core/http-conn.c @@ -42,6 +42,7 @@ #include "network.h" #include "sslconn.h" +#include "sipe-common.h" #include "sipmsg.h" #include "sip-sec.h" #include "sipe-utils.h" diff --git a/src/core/sip-csta.c b/src/core/sip-csta.c index 8ca8f3ce..f1d949d0 100644 --- a/src/core/sip-csta.c +++ b/src/core/sip-csta.c @@ -36,7 +36,7 @@ #include "sipmsg.h" #include "sip-csta.h" #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-dialog.h" #include "sipe-utils.h" #include "sipe-xml.h" diff --git a/src/core/sip-sec-krb5.c b/src/core/sip-sec-krb5.c index 8d75fc83..4513dd22 100644 --- a/src/core/sip-sec-krb5.c +++ b/src/core/sip-sec-krb5.c @@ -27,6 +27,7 @@ #include #include +#include "sipe-common.h" #include "sip-sec.h" #include "sip-sec-mech.h" #include "sip-sec-krb5.h" diff --git a/src/core/sip-sec.c b/src/core/sip-sec.c index 9b146171..8d866df3 100644 --- a/src/core/sip-sec.c +++ b/src/core/sip-sec.c @@ -32,8 +32,9 @@ #include +#include "sipe-common.h" #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-utils.h" #include "sip-sec-mech.h" diff --git a/src/core/sip-sec.h b/src/core/sip-sec.h index b148eef9..fb5b65fe 100644 --- a/src/core/sip-sec.h +++ b/src/core/sip-sec.h @@ -22,8 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define SIPE_UNUSED_PARAMETER __attribute__((unused)) - /* Opaque type definition for security context */ typedef struct sip_sec_context *SipSecContext; @@ -36,7 +34,7 @@ typedef enum sip_sec_auth_type AUTH_TYPE_NEGOTIATE } SipSecAuthType; -//// Sipe convenience methods //// +/*** Sipe convenience methods ***/ /** * Initializes Sipe security context. diff --git a/src/core/sipe-cal.c b/src/core/sipe-cal.c index 0298994b..01af3538 100644 --- a/src/core/sipe-cal.c +++ b/src/core/sipe-cal.c @@ -32,7 +32,7 @@ #include #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-cal.h" #include "sipe-nls.h" #include "sipe-utils.h" diff --git a/src/core/sipe-chat.c b/src/core/sipe-chat.c index 784b13f8..6c395b3e 100644 --- a/src/core/sipe-chat.c +++ b/src/core/sipe-chat.c @@ -30,7 +30,7 @@ #include "sipe-common.h" #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-chat.h" #include "sipe-nls.h" #include "sipe-session.h" diff --git a/src/core/sipe-conf.c b/src/core/sipe-conf.c index 0259602c..581b31b5 100644 --- a/src/core/sipe-conf.c +++ b/src/core/sipe-conf.c @@ -34,6 +34,7 @@ #include "conversation.h" #include "debug.h" +#include "sipe-common.h" #include "sipmsg.h" #include "sip-sec.h" #include "sipe-chat.h" diff --git a/src/core/sipe-dialog.c b/src/core/sipe-dialog.c index ad2f3d44..01857239 100644 --- a/src/core/sipe-dialog.c +++ b/src/core/sipe-dialog.c @@ -28,7 +28,7 @@ #include "sipe-common.h" #include "sipmsg.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-dialog.h" #include "sipe-session.h" #include "sipe-utils.h" diff --git a/src/core/sipe-ews.c b/src/core/sipe-ews.c index 88db5103..f4322dea 100644 --- a/src/core/sipe-ews.c +++ b/src/core/sipe-ews.c @@ -52,9 +52,10 @@ be great to implement too. #include "debug.h" #include "util.h" +#include "sipe-common.h" +#include "sip-sec.h" #include "sipe-cal.h" #include "sipe-ews.h" -#include "sip-sec.h" #include "sipe-utils.h" #include "sipe-xml.h" #include "http-conn.h" diff --git a/src/core/sipe-ft.c b/src/core/sipe-ft.c index 99711241..4d6778eb 100644 --- a/src/core/sipe-ft.c +++ b/src/core/sipe-ft.c @@ -56,6 +56,7 @@ #endif #endif +#include "sipe-common.h" #include "sipmsg.h" #include "sip-sec.h" #include "sipe-dialog.h" diff --git a/src/core/sipe-mime.c b/src/core/sipe-mime.c index ae796e60..061f08c6 100644 --- a/src/core/sipe-mime.c +++ b/src/core/sipe-mime.c @@ -24,7 +24,7 @@ #include "mime.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-mime.h" void sipe_mime_parts_foreach(const gchar *type, diff --git a/src/core/sipe-session.c b/src/core/sipe-session.c index 2115f804..56a48e9e 100644 --- a/src/core/sipe-session.c +++ b/src/core/sipe-session.c @@ -27,7 +27,7 @@ #include #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-dialog.h" #include "sipe-session.h" #include "sipe-utils.h" diff --git a/src/core/sipe-sign.c b/src/core/sipe-sign.c index 7d9e86fe..94bf7f85 100644 --- a/src/core/sipe-sign.c +++ b/src/core/sipe-sign.c @@ -25,7 +25,7 @@ #include #include "sipmsg.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-sign.h" static gchar * const empty_string = ""; diff --git a/src/core/sipe-utils.c b/src/core/sipe-utils.c index 5baf372e..f8db7ecf 100644 --- a/src/core/sipe-utils.c +++ b/src/core/sipe-utils.c @@ -32,7 +32,7 @@ #include "xmlnode.h" #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-utils.h" #include "uuid.h" #include "sipe.h" diff --git a/src/core/sipe-xml-tests.c b/src/core/sipe-xml-tests.c index fb52549b..180dabc9 100644 --- a/src/core/sipe-xml-tests.c +++ b/src/core/sipe-xml-tests.c @@ -31,7 +31,7 @@ #include #include "sipe-common.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-xml.h" #include "sipe-utils.h" diff --git a/src/core/sipe-xml.c b/src/core/sipe-xml.c index 2ec395a8..79aa2695 100644 --- a/src/core/sipe-xml.c +++ b/src/core/sipe-xml.c @@ -30,7 +30,7 @@ #include "libxml/parser.h" #include "glib.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-utils.h" #include "sipe-xml.h" diff --git a/src/core/sipe.c b/src/core/sipe.c index f966b39f..83ec1af8 100644 --- a/src/core/sipe.c +++ b/src/core/sipe.c @@ -90,11 +90,11 @@ #include "sipmsg.h" #include "sip-csta.h" #include "sip-sec.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" #include "sipe-cal.h" #include "sipe-chat.h" #include "sipe-conf.h" -#include "sipe-core-api.h" +#include "sipe-core.h" #include "sipe-dialog.h" #include "sipe-ews.h" #include "sipe-ft.h" diff --git a/src/purple/purple-debug.c b/src/purple/purple-debug.c index e0a5dc95..10ca2166 100644 --- a/src/purple/purple-debug.c +++ b/src/purple/purple-debug.c @@ -25,7 +25,7 @@ #include "glib.h" #include "debug.h" -#include "sipe-backend-debug.h" +#include "sipe-backend.h" void sipe_backend_debug(sipe_debug_level level, const gchar *format, diff --git a/src/purple/purple-plugin.c b/src/purple/purple-plugin.c index de27ca0d..32be69a4 100644 --- a/src/purple/purple-plugin.c +++ b/src/purple/purple-plugin.c @@ -35,7 +35,7 @@ #include "prpl.h" #include "plugin.h" -#include "sipe-core-api.h" +#include "sipe-core.h" #include "sipe-nls.h" #include "core-depurple.h" -- 2.11.4.GIT