From 1cc33cc4915b04d08604d959ff3286a753bfc813 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 13 Jan 2013 00:05:25 +0000
Subject: [PATCH] Changed Jid typedef to be explicit pointer

---
 src/jid.c        |  4 ++--
 src/jid.h        |  4 ++--
 src/muc.c        |  1 +
 tests/test_jid.c | 34 +++++++++++++++++-----------------
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/jid.c b/src/jid.c
index 839cbe68..4eef9384 100644
--- a/src/jid.c
+++ b/src/jid.c
@@ -26,10 +26,10 @@
 
 #include "jid.h"
 
-Jid
+Jid *
 jid_create(const gchar * const str)
 {
-    Jid result = NULL;
+    Jid *result = NULL;
 
     if (str == NULL) {
         return NULL;
diff --git a/src/jid.h b/src/jid.h
index 608d7ef4..3b172025 100644
--- a/src/jid.h
+++ b/src/jid.h
@@ -33,9 +33,9 @@ struct jid_t {
     char *fulljid;
 };
 
-typedef struct jid_t *Jid;
+typedef struct jid_t Jid;
 
-Jid jid_create(const gchar * const str);
+Jid * jid_create(const gchar * const str);
 
 gboolean jid_is_room(const char * const room_jid);
 char * create_full_room_jid(const char * const room,
diff --git a/src/muc.c b/src/muc.c
index c98c223b..0e26ccd2 100644
--- a/src/muc.c
+++ b/src/muc.c
@@ -29,6 +29,7 @@
 #include "prof_autocomplete.h"
 
 typedef struct _muc_room_t {
+
     char *room; // e.g. test@conference.server
     char *nick; // e.g. Some User
     char *subject;
diff --git a/tests/test_jid.c b/tests/test_jid.c
index 0b56b09d..c86054bd 100644
--- a/tests/test_jid.c
+++ b/tests/test_jid.c
@@ -5,103 +5,103 @@
 
 void create_jid_from_null_returns_null(void)
 {
-    Jid result = jid_create(NULL);
+    Jid *result = jid_create(NULL);
     assert_is_null(result);
 }
 
 void create_jid_from_empty_string_returns_null(void)
 {
-    Jid result = jid_create("");
+    Jid *result = jid_create("");
     assert_is_null(result);
 }
 
 void create_jid_from_full_returns_full(void)
 {
-    Jid result = jid_create("myuser@mydomain/laptop");
+    Jid *result = jid_create("myuser@mydomain/laptop");
     assert_string_equals("myuser@mydomain/laptop", result->fulljid);
 }
 
 void create_jid_from_full_returns_bare(void)
 {
-    Jid result = jid_create("myuser@mydomain/laptop");
+    Jid *result = jid_create("myuser@mydomain/laptop");
     assert_string_equals("myuser@mydomain", result->barejid);
 }
 
 void create_jid_from_full_returns_resourcepart(void)
 {
-    Jid result = jid_create("myuser@mydomain/laptop");
+    Jid *result = jid_create("myuser@mydomain/laptop");
     assert_string_equals("laptop", result->resourcepart);
 }
 
 void create_jid_from_full_returns_localpart(void)
 {
-    Jid result = jid_create("myuser@mydomain/laptop");
+    Jid *result = jid_create("myuser@mydomain/laptop");
     assert_string_equals("myuser", result->localpart);
 }
 
 void create_jid_from_full_returns_domainpart(void)
 {
-    Jid result = jid_create("myuser@mydomain/laptop");
+    Jid *result = jid_create("myuser@mydomain/laptop");
     assert_string_equals("mydomain", result->domainpart);
 }
 
 void create_jid_from_full_nolocal_returns_full(void)
 {
-    Jid result = jid_create("mydomain/laptop");
+    Jid *result = jid_create("mydomain/laptop");
     assert_string_equals("mydomain/laptop", result->fulljid);
 }
 
 void create_jid_from_full_nolocal_returns_bare(void)
 {
-    Jid result = jid_create("mydomain/laptop");
+    Jid *result = jid_create("mydomain/laptop");
     assert_string_equals("mydomain", result->barejid);
 }
 
 void create_jid_from_full_nolocal_returns_resourcepart(void)
 {
-    Jid result = jid_create("mydomain/laptop");
+    Jid *result = jid_create("mydomain/laptop");
     assert_string_equals("laptop", result->resourcepart);
 }
 
 void create_jid_from_full_nolocal_returns_domainpart(void)
 {
-    Jid result = jid_create("mydomain/laptop");
+    Jid *result = jid_create("mydomain/laptop");
     assert_string_equals("mydomain", result->domainpart);
 }
 
 void create_jid_from_full_nolocal_returns_null_localpart(void)
 {
-    Jid result = jid_create("mydomain/laptop");
+    Jid *result = jid_create("mydomain/laptop");
     assert_is_null(result->localpart);
 }
 
 void create_jid_from_bare_returns_null_full(void)
 {
-    Jid result = jid_create("myuser@mydomain");
+    Jid *result = jid_create("myuser@mydomain");
     assert_is_null(result->fulljid);
 }
 
 void create_jid_from_bare_returns_null_resource(void)
 {
-    Jid result = jid_create("myuser@mydomain");
+    Jid *result = jid_create("myuser@mydomain");
     assert_is_null(result->resourcepart);
 }
 
 void create_jid_from_bare_returns_bare(void)
 {
-    Jid result = jid_create("myuser@mydomain");
+    Jid *result = jid_create("myuser@mydomain");
     assert_string_equals("myuser@mydomain", result->barejid);
 }
 
 void create_jid_from_bare_returns_localpart(void)
 {
-    Jid result = jid_create("myuser@mydomain");
+    Jid *result = jid_create("myuser@mydomain");
     assert_string_equals("myuser", result->localpart);
 }
 
 void create_jid_from_bare_returns_domainpart(void)
 {
-    Jid result = jid_create("myuser@mydomain");
+    Jid *result = jid_create("myuser@mydomain");
     assert_string_equals("mydomain", result->domainpart);
 }