Renaming Target -> Tag

diff --git a/lib/neardal.c b/lib/neardal.c
index f81eaae..164fc15 100644 (file)
--- a/lib/neardal.c
+++ b/lib/neardal.c
@@ -501,7 +501,7 @@ errorCode_t neardal_get_record_properties(const char *recordName,
        record->type            = (const char *) rcdProp->type;
        record->representation  = (const char *) rcdProp->representation;
        record->uri             = (const char *) rcdProp->uri;
-       record->uriObjSize      = (uint) rcdProp->uriObjSize;
+       record->uriObjSize      = (unsigned int) rcdProp->uriObjSize;
        record->mime            = (const char *) rcdProp->mime;
 
 exit:

diff --git a/lib/neardal_adapter.c b/lib/neardal_adapter.c
index b1a1535..936932e 100644 (file)
--- a/lib/neardal_adapter.c
+++ b/lib/neardal_adapter.c
@@ -102,7 +102,7 @@ static void neardal_adp_prv_cb_property_changed(orgNeardAdp *proxy,
                                                void        *user_data)
 {
        AdpProp         *adpProp        = NULL;
-       errorCode_t     errCode         = NEARDAL_ERROR_NO_TARGET;
+       errorCode_t     errCode         = NEARDAL_ERROR_NO_TAG;
        char            *tagName        = NULL;
        void            *clientValue    = NULL;
        TagProp         *tagProp        = NULL;
@@ -166,7 +166,7 @@ static void neardal_adp_prv_cb_property_changed(orgNeardAdp *proxy,
                        errCode = neardal_mgr_prv_get_tag(adpProp,
                                                             tagName,
                                                             &tagProp);
-                       if (errCode == NEARDAL_ERROR_NO_TARGET) {
+                       if (errCode == NEARDAL_ERROR_NO_TAG) {
                                neardal_adp_prv_cb_tag_found(NULL,
                                                                tagName,
                                                                adpProp);
@@ -266,7 +266,7 @@ exit:
 errorCode_t neardal_adp_prv_get_tag(AdpProp *adpProp, gchar *tagName,
                                       TagProp **tagProp)
 {
-       errorCode_t     errCode = NEARDAL_ERROR_NO_TARGET;
+       errorCode_t     errCode = NEARDAL_ERROR_NO_TAG;
        guint           len = 0;
        TagProp         *tag;
 

diff --git a/lib/neardal_errors.c b/lib/neardal_errors.c
index 0190927..f881c31 100644 (file)
--- a/lib/neardal_errors.c
+++ b/lib/neardal_errors.c
@@ -48,7 +48,7 @@ char *neardal_error_get_text(errorCode_t ec)
        case NEARDAL_ERROR_NO_ADAPTER:
                return "No NFC adapter found...";
 
-       case NEARDAL_ERROR_NO_TARGET:
+       case NEARDAL_ERROR_NO_TAG:
                return "No NFC tag found...";
 
        case NEARDAL_ERROR_NO_RECORD:

diff --git a/lib/neardal_errors.h b/lib/neardal_errors.h
index cea7941..77c3f0f 100644 (file)
--- a/lib/neardal_errors.h
+++ b/lib/neardal_errors.h
@@ -62,7 +62,7 @@ typedef               int     errorCode_t;
 /*! @brief Neard service, polling already active */
 #define NEARDAL_ERROR_POLLING_ALREADY_ACTIVE           ((errorCode_t) -8)
 /*! @brief Neard service, no NEARDAL tag present */
-#define NEARDAL_ERROR_NO_TARGET                        ((errorCode_t) -9)
+#define NEARDAL_ERROR_NO_TAG                   ((errorCode_t) -9)
 /*! @brief Neard service, no NEARDAL record present */
 #define NEARDAL_ERROR_NO_RECORD                        ((errorCode_t) -10)
 

diff --git a/lib/neardal_manager.c b/lib/neardal_manager.c
index 53d11e4..3028c12 100644 (file)
--- a/lib/neardal_manager.c
+++ b/lib/neardal_manager.c
@@ -208,7 +208,7 @@ errorCode_t neardal_mgr_prv_get_adapter_from_proxy(orgNeardAdp *adpProxy,
 errorCode_t neardal_mgr_prv_get_tag(AdpProp *adpProp, gchar *tagName,
                                       TagProp **tagProp)
 {
-       errorCode_t     errCode = NEARDAL_ERROR_NO_TARGET;
+       errorCode_t     errCode = NEARDAL_ERROR_NO_TAG;
        guint           len;
        TagProp         *tag    = NULL;
        GList           *tmpList;

diff --git a/lib/neardal_tag.c b/lib/neardal_tag.c
index 71fd4e9..0bca77c 100644 (file)
--- a/lib/neardal_tag.c
+++ b/lib/neardal_tag.c
@@ -251,7 +251,7 @@ errorCode_t neardal_get_tags(char *adpName, char ***array, int *len)
 
        tagNb = g_list_length(adpProp->tagList);
        if (tagNb <= 0)
-               return NEARDAL_ERROR_NO_TARGET;
+               return NEARDAL_ERROR_NO_TAG;
 
        err = NEARDAL_ERROR_NO_MEMORY;
        tags = g_try_malloc0((tagNb + 1) * sizeof(char *));

diff --git a/lib/neardal_tag.h b/lib/neardal_tag.h
index 60152f8..3ae4c9b 100644 (file)
--- a/lib/neardal_tag.h
+++ b/lib/neardal_tag.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __NEARDAL_TARGET_H
-#define __NEARDAL_TARGET_H
+#ifndef __NEARDAL_TAG_H
+#define __NEARDAL_TAG_H
 
 #include "neard_tag_proxy.h"
 #include "neardal_record.h"
@@ -28,7 +28,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define NEARD_TARGETS_IF_NAME          "org.neard.Tag"
+#define NEARD_TAGS_IF_NAME             "org.neard.Tag"
 #define NEARD_TGT_SIG_PROPCHANGED      "property-changed"
 
 /* NEARDAL Tag Properties */
@@ -78,4 +78,4 @@ errorCode_t neardal_tag_write(TagProp *tagProp, RcdProp *rcd);
 }
 #endif /* __cplusplus */
 
-#endif /* __NEARDAL_TARGET_H */
+#endif /* __NEARDAL_TAG_H */