remove unsued func:get_primary_id

Change-Id: I5b65ecfa4a8c4db3766f0994440a6f6dd78adb80
Signed-off-by: Gukhwan Cho <gh78.cho@samsung.com>

diff --git a/common/ipc/ctsvc_ipc_activity.c b/common/ipc/ctsvc_ipc_activity.c
index 1ebfe2f..c7c5f74 100644 (file)
--- a/common/ipc/ctsvc_ipc_activity.c
+++ b/common/ipc/ctsvc_ipc_activity.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_activity(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_activity(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_activity_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_activity_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_activity,
-       .marshal_record = __ctsvc_ipc_marshal_activity,
-       .get_primary_id = __ctsvc_ipc_marshal_activity_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_activity
 };
 
 
@@ -84,8 +82,3 @@ static int __ctsvc_ipc_marshal_activity(const contacts_record_h record, pims_ipc
 
 }
 
-static int __ctsvc_ipc_marshal_activity_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_ACTIVITY_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_activity_photo.c b/common/ipc/ctsvc_ipc_activity_photo.c
index d0fe9c1..5be53cd 100644 (file)
--- a/common/ipc/ctsvc_ipc_activity_photo.c
+++ b/common/ipc/ctsvc_ipc_activity_photo.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_activity_photo(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_activity_photo(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_activity_photo_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_activity_photo_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_activity_photo,
-       .marshal_record = __ctsvc_ipc_marshal_activity_photo,
-       .get_primary_id = __ctsvc_ipc_marshal_activity_photo_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_activity_photo
 };
 
 
@@ -74,8 +72,3 @@ static int __ctsvc_ipc_marshal_activity_photo(const contacts_record_h record, pi
 
 }
 
-static int __ctsvc_ipc_marshal_activity_photo_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_ACTIVITY_PHOTO_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_address.c b/common/ipc/ctsvc_ipc_address.c
index adbad25..93e29ab 100644 (file)
--- a/common/ipc/ctsvc_ipc_address.c
+++ b/common/ipc/ctsvc_ipc_address.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_address(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_address(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_address_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_address_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_address,
-       .marshal_record = __ctsvc_ipc_marshal_address,
-       .get_primary_id = __ctsvc_ipc_marshal_address_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_address
 };
 
 
@@ -89,9 +87,3 @@ static int __ctsvc_ipc_marshal_address(const contacts_record_h record, pims_ipc_
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_address_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_ADDRESS_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-

diff --git a/common/ipc/ctsvc_ipc_addressbook.c b/common/ipc/ctsvc_ipc_addressbook.c
index 783e18b..4642a21 100644 (file)
--- a/common/ipc/ctsvc_ipc_addressbook.c
+++ b/common/ipc/ctsvc_ipc_addressbook.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_addressbook(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_addressbook(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_addressbook_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_addressbook_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_addressbook,
-       .marshal_record = __ctsvc_ipc_marshal_addressbook,
-       .get_primary_id = __ctsvc_ipc_marshal_addressbook_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_addressbook
 };
 
 
@@ -72,9 +70,3 @@ static int __ctsvc_ipc_marshal_addressbook(const contacts_record_h record, pims_
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_addressbook_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_ADDRESSBOOK_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-

diff --git a/common/ipc/ctsvc_ipc_company.c b/common/ipc/ctsvc_ipc_company.c
index 9f6f081..d877392 100644 (file)
--- a/common/ipc/ctsvc_ipc_company.c
+++ b/common/ipc/ctsvc_ipc_company.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_company(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_company(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_company_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_company_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_company,
-       .marshal_record = __ctsvc_ipc_marshal_company,
-       .get_primary_id = __ctsvc_ipc_marshal_company_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_company
 };
 
 
@@ -92,8 +90,3 @@ static int __ctsvc_ipc_marshal_company(const contacts_record_h record, pims_ipc_
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_company_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_COMPANY_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_contact.c b/common/ipc/ctsvc_ipc_contact.c
index 9fe9419..af67bfc 100644 (file)
--- a/common/ipc/ctsvc_ipc_contact.c
+++ b/common/ipc/ctsvc_ipc_contact.c
@@ -22,12 +22,10 @@
 
 static int __ctsvc_ipc_unmarshal_contact(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_contact(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_contact_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_contact_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_contact,
-       .marshal_record = __ctsvc_ipc_marshal_contact,
-       .get_primary_id = __ctsvc_ipc_marshal_contact_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_contact
 };
 
 static int __ctsvc_ipc_unmarshal_contact(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record)
@@ -139,8 +137,3 @@ static int __ctsvc_ipc_marshal_contact(const contacts_record_h record, pims_ipc_
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_contact_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_CONTACT_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_email.c b/common/ipc/ctsvc_ipc_email.c
index 7960c1a..233658a 100644 (file)
--- a/common/ipc/ctsvc_ipc_email.c
+++ b/common/ipc/ctsvc_ipc_email.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_email(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_email(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_email_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_email_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_email,
-       .marshal_record = __ctsvc_ipc_marshal_email,
-       .get_primary_id = __ctsvc_ipc_marshal_email_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_email
 };
 
 
@@ -77,8 +75,3 @@ static int __ctsvc_ipc_marshal_email(const contacts_record_h record, pims_ipc_da
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_email_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_EMAIL_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_event.c b/common/ipc/ctsvc_ipc_event.c
index 4d1ff88..499a49f 100644 (file)
--- a/common/ipc/ctsvc_ipc_event.c
+++ b/common/ipc/ctsvc_ipc_event.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_event(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_event(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_event_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_event_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_event,
-       .marshal_record = __ctsvc_ipc_marshal_event,
-       .get_primary_id = __ctsvc_ipc_marshal_event_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_event
 };
 
 
@@ -77,8 +75,3 @@ static int __ctsvc_ipc_marshal_event(const contacts_record_h record, pims_ipc_da
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_event_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_EVENT_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_extension.c b/common/ipc/ctsvc_ipc_extension.c
index 472059b..19cea2b 100644 (file)
--- a/common/ipc/ctsvc_ipc_extension.c
+++ b/common/ipc/ctsvc_ipc_extension.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_extension(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_extension(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_extension_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_extension_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_extension,
-       .marshal_record = __ctsvc_ipc_marshal_extension,
-       .get_primary_id = __ctsvc_ipc_marshal_extension_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_extension
 };
 
 
@@ -93,9 +91,3 @@ static int __ctsvc_ipc_marshal_extension(const contacts_record_h record, pims_ip
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_extension_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_EXTENSION_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-

diff --git a/common/ipc/ctsvc_ipc_group.c b/common/ipc/ctsvc_ipc_group.c
index 17e9482..40c2b9b 100644 (file)
--- a/common/ipc/ctsvc_ipc_group.c
+++ b/common/ipc/ctsvc_ipc_group.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_group(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_group(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_group_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_group_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_group,
-       .marshal_record = __ctsvc_ipc_marshal_group,
-       .get_primary_id = __ctsvc_ipc_marshal_group_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_group
 };
 
 
@@ -82,8 +80,3 @@ static int __ctsvc_ipc_marshal_group(const contacts_record_h record, pims_ipc_da
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_group_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_GROUP_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_grouprelation.c b/common/ipc/ctsvc_ipc_grouprelation.c
index 2901c10..ce9fa8e 100644 (file)
--- a/common/ipc/ctsvc_ipc_grouprelation.c
+++ b/common/ipc/ctsvc_ipc_grouprelation.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_group_relation(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_group_relation(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_group_relation_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_group_relation_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_group_relation,
-       .marshal_record = __ctsvc_ipc_marshal_group_relation,
-       .get_primary_id = __ctsvc_ipc_marshal_group_relation_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_group_relation
 };
 
 
@@ -73,8 +71,3 @@ static int __ctsvc_ipc_marshal_group_relation(const contacts_record_h record, pi
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_group_relation_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_GROUP_RELATION_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_image.c b/common/ipc/ctsvc_ipc_image.c
index 0bb72f3..d7ceeca 100644 (file)
--- a/common/ipc/ctsvc_ipc_image.c
+++ b/common/ipc/ctsvc_ipc_image.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_image(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_image(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_image_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_image_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_image,
-       .marshal_record = __ctsvc_ipc_marshal_image,
-       .get_primary_id = __ctsvc_ipc_marshal_image_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_image
 };
 
 
@@ -75,8 +73,3 @@ static int __ctsvc_ipc_marshal_image(const contacts_record_h record, pims_ipc_da
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_image_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_IMAGE_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_marshal.c b/common/ipc/ctsvc_ipc_marshal.c
index 15f6b78..9e5219e 100644 (file)
--- a/common/ipc/ctsvc_ipc_marshal.c
+++ b/common/ipc/ctsvc_ipc_marshal.c
@@ -483,22 +483,6 @@ int ctsvc_ipc_marshal_record(const contacts_record_h record, pims_ipc_data_h ipc
        return ret;
 }
 
-int ctsvc_ipc_marshal_record_get_primary_id(const contacts_record_h record,
-               unsigned int *property_id, int *id)
-{
-       RETVM_IF(NULL == record || NULL == property_id || NULL == id, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter");
-
-       ctsvc_record_s *temp = (ctsvc_record_s*)(record);
-
-       ctsvc_ipc_marshal_record_plugin_cb_s *plugin_cb = __ctsvc_ipc_marshal_get_plugin_cb(temp->r_type);
-
-       RETVM_IF(NULL == plugin_cb || NULL == plugin_cb->get_primary_id, CONTACTS_ERROR_INVALID_PARAMETER, "Invalid parameter");
-
-       int ret = plugin_cb->get_primary_id(record, property_id,id);
-
-       return ret;
-}
-
 int ctsvc_ipc_unmarshal_string(const pims_ipc_data_h ipc_data, char** ppbufchar)
 {
        int ret = CONTACTS_ERROR_NONE;

diff --git a/common/ipc/ctsvc_ipc_marshal.h b/common/ipc/ctsvc_ipc_marshal.h
index d9ff819..17a640f 100644 (file)
--- a/common/ipc/ctsvc_ipc_marshal.h
+++ b/common/ipc/ctsvc_ipc_marshal.h
@@ -33,17 +33,14 @@
  */
 typedef int (*ctsvc_ipc_unmarshal_record_cb)(const pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h precord);
 typedef int (*ctsvc_ipc_marshal_record_cb)(const contacts_record_h record, pims_ipc_data_h ipc_data);
-typedef int (*ctsvc_ipc_marshal_record_get_primary_id_cb)(const contacts_record_h record, unsigned int *property_id, int *id);
 
 typedef struct {
     ctsvc_ipc_unmarshal_record_cb unmarshal_record;
     ctsvc_ipc_marshal_record_cb marshal_record;
-    ctsvc_ipc_marshal_record_get_primary_id_cb get_primary_id;
 } ctsvc_ipc_marshal_record_plugin_cb_s;
 
 int ctsvc_ipc_unmarshal_record(const pims_ipc_data_h ipc_data, contacts_record_h* precord);
 int ctsvc_ipc_marshal_record(const contacts_record_h record, pims_ipc_data_h ipc_data);
-int ctsvc_ipc_marshal_record_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 /*
  * string

diff --git a/common/ipc/ctsvc_ipc_messenger.c b/common/ipc/ctsvc_ipc_messenger.c
index 5e461e1..2ac114f 100644 (file)
--- a/common/ipc/ctsvc_ipc_messenger.c
+++ b/common/ipc/ctsvc_ipc_messenger.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_messenger(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_messenger(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_messenger_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_messenger_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_messenger,
-       .marshal_record = __ctsvc_ipc_marshal_messenger,
-       .get_primary_id = __ctsvc_ipc_marshal_messenger_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_messenger
 };
 
 
@@ -74,8 +72,3 @@ static int __ctsvc_ipc_marshal_messenger(const contacts_record_h record, pims_ip
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_messenger_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_MESSENGER_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_my_profile.c b/common/ipc/ctsvc_ipc_my_profile.c
index 2991166..bd13078 100644 (file)
--- a/common/ipc/ctsvc_ipc_my_profile.c
+++ b/common/ipc/ctsvc_ipc_my_profile.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_my_profile(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_my_profile(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_my_profile_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_my_profile_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_my_profile,
-       .marshal_record = __ctsvc_ipc_marshal_my_profile,
-       .get_primary_id = __ctsvc_ipc_marshal_my_profile_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_my_profile
 };
 
 static int __ctsvc_ipc_unmarshal_my_profile(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record)
@@ -106,9 +104,3 @@ static int __ctsvc_ipc_marshal_my_profile(const contacts_record_h record, pims_i
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_my_profile_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_CONTACT_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-

diff --git a/common/ipc/ctsvc_ipc_name.c b/common/ipc/ctsvc_ipc_name.c
index 7ac3670..608a858 100644 (file)
--- a/common/ipc/ctsvc_ipc_name.c
+++ b/common/ipc/ctsvc_ipc_name.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_name(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_name(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_name_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_name_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_name,
-       .marshal_record = __ctsvc_ipc_marshal_name,
-       .get_primary_id = __ctsvc_ipc_marshal_name_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_name
 };
 
 
@@ -93,8 +91,3 @@ static int __ctsvc_ipc_marshal_name(const contacts_record_h record, pims_ipc_dat
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_name_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_NAME_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_nickname.c b/common/ipc/ctsvc_ipc_nickname.c
index e9d0977..fdaeed1 100644 (file)
--- a/common/ipc/ctsvc_ipc_nickname.c
+++ b/common/ipc/ctsvc_ipc_nickname.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_nickname(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_nickname(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_nickname_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_nickname_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_nickname,
-       .marshal_record = __ctsvc_ipc_marshal_nickname,
-       .get_primary_id = __ctsvc_ipc_marshal_nickname_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_nickname
 };
 
 
@@ -74,8 +72,3 @@ static int __ctsvc_ipc_marshal_nickname(const contacts_record_h record, pims_ipc
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_nickname_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_NICKNAME_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_note.c b/common/ipc/ctsvc_ipc_note.c
index c750a9c..d4ed96b 100644 (file)
--- a/common/ipc/ctsvc_ipc_note.c
+++ b/common/ipc/ctsvc_ipc_note.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_note(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_note(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_note_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_note_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_note,
-       .marshal_record = __ctsvc_ipc_marshal_note,
-       .get_primary_id = __ctsvc_ipc_marshal_note_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_note
 };
 
 
@@ -70,8 +68,3 @@ static int __ctsvc_ipc_marshal_note(const contacts_record_h record, pims_ipc_dat
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_note_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_NOTE_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_number.c b/common/ipc/ctsvc_ipc_number.c
index 7839a15..7a54f9c 100644 (file)
--- a/common/ipc/ctsvc_ipc_number.c
+++ b/common/ipc/ctsvc_ipc_number.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_number(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_number(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_number_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_number_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_number,
-       .marshal_record = __ctsvc_ipc_marshal_number,
-       .get_primary_id = __ctsvc_ipc_marshal_number_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_number
 };
 
 static int __ctsvc_ipc_unmarshal_number(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record)
@@ -75,8 +73,3 @@ static int __ctsvc_ipc_marshal_number(const contacts_record_h record, pims_ipc_d
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_number_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_NUMBER_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_person.c b/common/ipc/ctsvc_ipc_person.c
index 5b62fba..d795151 100644 (file)
--- a/common/ipc/ctsvc_ipc_person.c
+++ b/common/ipc/ctsvc_ipc_person.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_person(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_person(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_person_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_person_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_person,
-       .marshal_record = __ctsvc_ipc_marshal_person,
-       .get_primary_id = __ctsvc_ipc_marshal_person_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_person
 };
 
 
@@ -93,8 +91,3 @@ static int __ctsvc_ipc_marshal_person(const contacts_record_h record, pims_ipc_d
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_person_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_PERSON_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_phonelog.c b/common/ipc/ctsvc_ipc_phonelog.c
index 164d272..903fa85 100644 (file)
--- a/common/ipc/ctsvc_ipc_phonelog.c
+++ b/common/ipc/ctsvc_ipc_phonelog.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_phonelog(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_phonelog(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_phonelog_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_phonelog_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_phonelog,
-       .marshal_record = __ctsvc_ipc_marshal_phonelog,
-       .get_primary_id = __ctsvc_ipc_marshal_phonelog_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_phonelog
 };
 
 
@@ -80,8 +78,3 @@ static int __ctsvc_ipc_marshal_phonelog(const contacts_record_h record, pims_ipc
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_phonelog_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_PHONELOG_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_profile.c b/common/ipc/ctsvc_ipc_profile.c
index 1b9f865..d559bc4 100644 (file)
--- a/common/ipc/ctsvc_ipc_profile.c
+++ b/common/ipc/ctsvc_ipc_profile.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_profile(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_profile(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_profile_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_profile_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_profile,
-       .marshal_record = __ctsvc_ipc_marshal_profile,
-       .get_primary_id = __ctsvc_ipc_marshal_profile_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_profile
 };
 
 
@@ -86,8 +84,3 @@ static int __ctsvc_ipc_marshal_profile(const contacts_record_h record, pims_ipc_
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_profile_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_PROFILE_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_relationship.c b/common/ipc/ctsvc_ipc_relationship.c
index ca89a63..68c8b7d 100644 (file)
--- a/common/ipc/ctsvc_ipc_relationship.c
+++ b/common/ipc/ctsvc_ipc_relationship.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_relationship(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_relationship(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_relationship_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_relationship_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_relationship,
-       .marshal_record = __ctsvc_ipc_marshal_relationship,
-       .get_primary_id = __ctsvc_ipc_marshal_relationship_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_relationship
 };
 
 
@@ -73,8 +71,3 @@ static int __ctsvc_ipc_marshal_relationship(const contacts_record_h record, pims
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_relationship_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_RELATIONSHIP_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_result.c b/common/ipc/ctsvc_ipc_result.c
index 5f60c17..22917f5 100644 (file)
--- a/common/ipc/ctsvc_ipc_result.c
+++ b/common/ipc/ctsvc_ipc_result.c
@@ -26,8 +26,7 @@ static int __ctsvc_ipc_marshal_result(const contacts_record_h record, pims_ipc_d
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_result_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_result,
-       .marshal_record = __ctsvc_ipc_marshal_result,
-       .get_primary_id = NULL
+       .marshal_record = __ctsvc_ipc_marshal_result
 };
 
 

diff --git a/common/ipc/ctsvc_ipc_sdn.c b/common/ipc/ctsvc_ipc_sdn.c
index fa9c261..6ed7466 100644 (file)
--- a/common/ipc/ctsvc_ipc_sdn.c
+++ b/common/ipc/ctsvc_ipc_sdn.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_sdn(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_sdn(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_sdn_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_sdn_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_sdn,
-       .marshal_record = __ctsvc_ipc_marshal_sdn,
-       .get_primary_id = __ctsvc_ipc_marshal_sdn_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_sdn
 };
 
 
@@ -69,8 +67,3 @@ static int __ctsvc_ipc_marshal_sdn(const contacts_record_h record, pims_ipc_data
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_sdn_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_SDN_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}

diff --git a/common/ipc/ctsvc_ipc_simple_contact.c b/common/ipc/ctsvc_ipc_simple_contact.c
index a431d8e..102f482 100644 (file)
--- a/common/ipc/ctsvc_ipc_simple_contact.c
+++ b/common/ipc/ctsvc_ipc_simple_contact.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_simple_contact(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_simple_contact(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_simple_contact_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_simple_contact_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_simple_contact,
-       .marshal_record = __ctsvc_ipc_marshal_simple_contact,
-       .get_primary_id = __ctsvc_ipc_marshal_simple_contact_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_simple_contact
 };
 
 static int __ctsvc_ipc_unmarshal_simple_contact(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record)
@@ -88,9 +86,3 @@ static int __ctsvc_ipc_marshal_simple_contact(const contacts_record_h record, pi
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_simple_contact_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_CONTACT_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-

diff --git a/common/ipc/ctsvc_ipc_speeddial.c b/common/ipc/ctsvc_ipc_speeddial.c
index 41b704e..841551a 100644 (file)
--- a/common/ipc/ctsvc_ipc_speeddial.c
+++ b/common/ipc/ctsvc_ipc_speeddial.c
@@ -26,8 +26,7 @@ static int __ctsvc_ipc_marshal_speeddial(const contacts_record_h record, pims_ip
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_speeddial_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_speeddial,
-       .marshal_record = __ctsvc_ipc_marshal_speeddial,
-       .get_primary_id = NULL
+       .marshal_record = __ctsvc_ipc_marshal_speeddial
 };
 
 

diff --git a/common/ipc/ctsvc_ipc_updated_info.c b/common/ipc/ctsvc_ipc_updated_info.c
index fc3407a..07fae84 100644 (file)
--- a/common/ipc/ctsvc_ipc_updated_info.c
+++ b/common/ipc/ctsvc_ipc_updated_info.c
@@ -26,8 +26,7 @@ static int __ctsvc_ipc_marshal_updated_info(const contacts_record_h record, pims
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_updated_info_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_updated_info,
-       .marshal_record = __ctsvc_ipc_marshal_updated_info,
-       .get_primary_id = NULL
+       .marshal_record = __ctsvc_ipc_marshal_updated_info
 };
 
 

diff --git a/common/ipc/ctsvc_ipc_url.c b/common/ipc/ctsvc_ipc_url.c
index d9a5b8e..88d800f 100644 (file)
--- a/common/ipc/ctsvc_ipc_url.c
+++ b/common/ipc/ctsvc_ipc_url.c
@@ -23,12 +23,10 @@
 
 static int __ctsvc_ipc_unmarshal_url(pims_ipc_data_h ipc_data, const char* view_uri, contacts_record_h record);
 static int __ctsvc_ipc_marshal_url(const contacts_record_h record, pims_ipc_data_h ipc_data);
-static int __ctsvc_ipc_marshal_url_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id);
 
 ctsvc_ipc_marshal_record_plugin_cb_s _ctsvc_ipc_record_url_plugin_cb = {
        .unmarshal_record = __ctsvc_ipc_unmarshal_url,
-       .marshal_record = __ctsvc_ipc_marshal_url,
-       .get_primary_id = __ctsvc_ipc_marshal_url_get_primary_id
+       .marshal_record = __ctsvc_ipc_marshal_url
 };
 
 
@@ -73,9 +71,3 @@ static int __ctsvc_ipc_marshal_url(const contacts_record_h record, pims_ipc_data
        return CONTACTS_ERROR_INVALID_PARAMETER;
 }
 
-static int __ctsvc_ipc_marshal_url_get_primary_id(const contacts_record_h record, unsigned int *property_id, int *id)
-{
-       *property_id = CTSVC_PROPERTY_URL_ID;
-       return contacts_record_get_int(record, *property_id, id);
-}
-