Move non-public struct

TopicList struct and Attribute keys are moved to internal struct module.

Change-Id: Iab8d9c7a308eb107f12f59cc5cf999d092f58642
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index 9397e03..27906cc 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -31,25 +31,6 @@
 
 #define NS_UUID_STRING_SIZE 37
 
-#define NS_ATTRIBUTE_POLICY "ACCEPTER"
-#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
-#define NS_ATTRIBUTE_SYNC "SYNC_URI"
-#define NS_ATTRIBUTE_TOPIC "TOPIC_URI"
-#define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
-#define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
-#define NS_ATTRIBUTE_CONSUMER_ID "CONSUMER_ID"
-#define NS_ATTRIBUTE_TOPIC_LIST "TOPIC_LIST"
-#define NS_ATTRIBUTE_TOPIC_NAME "TOPIC_NAME"
-#define NS_ATTRIBUTE_TOPIC_SELECTION "TOPIC_STATE"
-#define NS_ATTRIBUTE_TITLE "TITLE"
-#define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
-#define NS_ATTRIBUTE_SOURCE "SOURCE"
-#define NS_ATTRIBUTE_STATE "STATE"
-#define NS_ATTRIBUTE_DEVICE "DEVICE"
-#define NS_ATTRIBUTE_TYPE "TYPE"
-#define NS_ATTRIBUTE_DATETIME "DATE_TIME"
-#define NS_ATTRIBUTE_TTL "TTL"
-
 /**
  * Result code of notification service
  */
@@ -82,6 +63,7 @@ typedef enum
     NS_SYNC_UNREAD = 0,
     NS_SYNC_READ = 1,
     NS_SYNC_DELETED = 2,
+
 } NSSyncType;
 
 /**
@@ -101,7 +83,7 @@ typedef enum
 } NSMessageType;
 
 /**
- *  Notification topic
+ *  Notification topic state
  */
 typedef enum
 {
@@ -110,6 +92,9 @@ typedef enum
 
 } NSTopicState;
 
+/**
+ * Topic linked list
+ */
 typedef struct _nsTopic
 {
     char * topicName;
@@ -118,16 +103,6 @@ typedef struct _nsTopic
 
 } NSTopicLL;
 
-typedef struct
-{
-    NSTopicLL * head;
-    NSTopicLL * tail;
-    //TODO: decide struct fields
-    char consumerId[NS_UUID_STRING_SIZE];
-    NSTopicLL ** topics;
-
-} NSTopicList;
-
 /**
  *  Consumer information
  */

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index a365e51..3f71dc6 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -173,6 +173,24 @@
         } \
     }
 
+#define NS_ATTRIBUTE_POLICY "ACCEPTER"
+#define NS_ATTRIBUTE_MESSAGE "MESSAGE_URI"
+#define NS_ATTRIBUTE_SYNC "SYNC_URI"
+#define NS_ATTRIBUTE_TOPIC "TOPIC_URI"
+#define NS_ATTRIBUTE_MESSAGE_ID "MESSAGE_ID"
+#define NS_ATTRIBUTE_PROVIDER_ID "PROVIDER_ID"
+#define NS_ATTRIBUTE_CONSUMER_ID "CONSUMER_ID"
+#define NS_ATTRIBUTE_TOPIC_LIST "TOPIC_LIST"
+#define NS_ATTRIBUTE_TOPIC_NAME "TOPIC_NAME"
+#define NS_ATTRIBUTE_TOPIC_SELECTION "TOPIC_STATE"
+#define NS_ATTRIBUTE_TITLE "TITLE"
+#define NS_ATTRIBUTE_TEXT "CONTENTTEXT"
+#define NS_ATTRIBUTE_SOURCE "SOURCE"
+#define NS_ATTRIBUTE_STATE "STATE"
+#define NS_ATTRIBUTE_DEVICE "DEVICE"
+#define NS_ATTRIBUTE_TYPE "TYPE"
+#define NS_ATTRIBUTE_DATETIME "DATE_TIME"
+#define NS_ATTRIBUTE_TTL "TTL"
 
 typedef enum eConnectionState
 {

diff --git a/service/notification/src/common/NSStructs.h b/service/notification/src/common/NSStructs.h
index bb5c68f..d38be95 100644 (file)
--- a/service/notification/src/common/NSStructs.h
+++ b/service/notification/src/common/NSStructs.h
@@ -37,6 +37,15 @@ typedef struct _nsTask
     struct _nsTask * nextTask;\r
 } NSTask;\r
 \r
+typedef struct\r
+{\r
+    NSTopicLL * head;\r
+    NSTopicLL * tail;\r
+    char consumerId[NS_UUID_STRING_SIZE];\r
+    NSTopicLL ** topics;\r
+\r
+} NSTopicList;\r
+\r
 typedef void * NSCacheData;\r
 \r
 typedef struct _NSCacheElement\r