Standardized types

diff --git a/lib/neardal.c b/lib/neardal.c
index 4fb075c..dd48808 100644 (file)
--- a/lib/neardal.c
+++ b/lib/neardal.c
@@ -269,20 +269,20 @@ errorCode_t neardal_publish(neardal_t neardalMgr, neardal_record *record)
        if (neardalMgr == NULL || record == NULL)
                goto exit;
 
-       err = neardal_mgr_prv_get_adapter(neardalMgr, record->name,
-                                                  &adpProp);
+       err = neardal_mgr_prv_get_adapter(neardalMgr, (gchar *) record->name,
+                                         &adpProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
-       rcd.name                = (char *) record->name;
-       rcd.action              = (char *) record->action;
-       rcd.encoding            = (char *) record->encoding;
-       rcd.handOver            = record->handOver;
-       rcd.language            = (char *) record->language;
-       rcd.type                = (char *) record->type;
-       rcd.representation      = (char *) record->representation;
-       rcd.uri                 = (char *) record->uri;
-       rcd.mime                = (char *) record->mime;
-       rcd.smartPoster         = record->smartPoster;
+       rcd.name                = (gchar *) record->name;
+       rcd.action              = (gchar *) record->action;
+       rcd.encoding            = (gchar *) record->encoding;
+       rcd.handOver            = (gboolean) record->handOver;
+       rcd.language            = (gchar *) record->language;
+       rcd.type                = (gchar *) record->type;
+       rcd.representation      = (gchar *) record->representation;
+       rcd.uri                 = (gchar *) record->uri;
+       rcd.mime                = (gchar *) record->mime;
+       rcd.smartPoster         = (gboolean) record->smartPoster;
 
         neardal_adp_publish(adpProp, &rcd);
 exit:
@@ -305,12 +305,12 @@ errorCode_t neardal_get_adapter_properties(neardal_t neardalMgr,
        if (neardalMgr == NULL || adpName == NULL || adapter == NULL)
                goto exit;
 
-       err = neardal_mgr_prv_get_adapter(neardalMgr, adpName,
+       err = neardal_mgr_prv_get_adapter(neardalMgr, (gchar *) adpName,
                                          &adpProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       adapter->name           = adpProp->name;
+       adapter->name           = (char *) adpProp->name;
        adapter->polling        = (short) adpProp->polling;
        adapter->powered        = (short) adpProp->powered;
 
@@ -326,13 +326,13 @@ errorCode_t neardal_get_adapter_properties(neardal_t neardalMgr,
                        ct = 0;
                        while (ct < adapter->nbProtocols) {
                                gchar *tmp = g_strdup(adpProp->protocols[ct]);
-                               adapter->protocols[ct++] = tmp;
+                               adapter->protocols[ct++] = (char *) tmp;
                        }
                        err = NEARDAL_SUCCESS;
                }
        }
 
-       adapter->nbTargets      = adpProp->tgtNb;
+       adapter->nbTargets      = (int) adpProp->tgtNb;
        adapter->targets        = NULL;
        if (adapter->nbTargets <= 0)
                goto exit;
@@ -374,19 +374,19 @@ errorCode_t neardal_get_target_properties(neardal_t neardalMgr,
 
        target->records = NULL;
        target->tagType = NULL;
-       err = neardal_mgr_prv_get_adapter(neardalMgr, tgtName,
-                                                  &adpProp);
+       err = neardal_mgr_prv_get_adapter(neardalMgr, (gchar *) tgtName,
+                                         &adpProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       err = neardal_mgr_prv_get_target(adpProp, tgtName, &tgtProp);
+       err = neardal_mgr_prv_get_target(adpProp, (gchar *) tgtName, &tgtProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       target->name            = tgtProp->name;
-       target->type            = tgtProp->type;
-       target->readOnly        = tgtProp->readOnly;
-       target->nbRecords       = tgtProp->rcdLen;
+       target->name            = (const char *) tgtProp->name;
+       target->type            = (const char *) tgtProp->type;
+       target->readOnly        = (short) tgtProp->readOnly;
+       target->nbRecords       = (int) tgtProp->rcdLen;
        if (target->nbRecords > 0) {
                err = NEARDAL_ERROR_NO_MEMORY;
                size = (target->nbRecords + 1) * sizeof(char *);
@@ -406,7 +406,7 @@ errorCode_t neardal_get_target_properties(neardal_t neardalMgr,
        target->nbTagTypes = 0;
        target->tagType = NULL;
        /* Count TagTypes */
-       target->nbTagTypes = tgtProp->tagTypeLen;
+       target->nbTagTypes = (int) tgtProp->tagTypeLen;
 
        if (target->nbTagTypes <= 0)
                goto exit;
@@ -443,32 +443,32 @@ errorCode_t neardal_get_record_properties(neardal_t neardalMgr,
        if (neardalMgr == NULL || recordName == NULL || record == NULL)
                goto exit;
 
-       err = neardal_mgr_prv_get_adapter(neardalMgr, recordName,
-                                                  &adpProp);
+       err = neardal_mgr_prv_get_adapter(neardalMgr, (gchar *) recordName,
+                                         &adpProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       err = neardal_mgr_prv_get_target(adpProp, recordName
-                                               , &tgtProp);
+       err = neardal_mgr_prv_get_target(adpProp, (gchar *) recordName,
+                                        &tgtProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       err = neardal_mgr_prv_get_record(tgtProp, recordName
-                                       , &rcdProp);
+       err = neardal_mgr_prv_get_record(tgtProp, (gchar *) recordName,
+                                        &rcdProp);
        if (err != NEARDAL_SUCCESS)
                goto exit;
 
-       record->name            = rcdProp->name;
-       record->encoding        = rcdProp->encoding;
+       record->name            = (const char *) rcdProp->name;
+       record->encoding        = (const char *) rcdProp->encoding;
        record->handOver        = (short) rcdProp->handOver;
-       record->language        = rcdProp->language;
+       record->language        = (const char *) rcdProp->language;
        record->smartPoster     = (short) rcdProp->smartPoster;
-       record->action          = rcdProp->action;
+       record->action          = (const char *) rcdProp->action;
 
-       record->type            = rcdProp->type;
-       record->representation  = rcdProp->representation;
-       record->uri             = rcdProp->uri;
-       record->mime            = rcdProp->mime;
+       record->type            = (const char *) rcdProp->type;
+       record->representation  = (const char *) rcdProp->representation;
+       record->uri             = (const char *) rcdProp->uri;
+       record->mime            = (const char *) rcdProp->mime;
 
 exit:
        return err;

diff --git a/lib/neardal_adapter.c b/lib/neardal_adapter.c
index fa13868..91cdd21 100644 (file)
--- a/lib/neardal_adapter.c
+++ b/lib/neardal_adapter.c
@@ -278,7 +278,7 @@ exit:
 /******************************************************************************
  * neardal_adp_prv_get_current_target: Get current NFC target
  *****************************************************************************/
-errorCode_t neardal_adp_prv_get_target(AdpProp *adpProp, char *tgtName,
+errorCode_t neardal_adp_prv_get_target(AdpProp *adpProp, gchar *tgtName,
                                       TgtProp **tgtProp)
 {
        errorCode_t     errCode = NEARDAL_ERROR_NO_TARGET;
@@ -445,7 +445,7 @@ errorCode_t neardal_get_adapters(neardal_t neardalMgr, char ***array,
  * neardal_adp_add: add new NFC adapter, initialize DBus Proxy connection,
  * register adapter signal
  *****************************************************************************/
-errorCode_t neardal_adp_add(neardal_t neardalMgr, char *adapterName)
+errorCode_t neardal_adp_add(neardal_t neardalMgr, gchar *adapterName)
 {
        errorCode_t     errCode = NEARDAL_SUCCESS;
        AdpProp         *adpProp = NULL;

diff --git a/lib/neardal_adapter.h b/lib/neardal_adapter.h
index b015227..6bc8845 100644 (file)
--- a/lib/neardal_adapter.h
+++ b/lib/neardal_adapter.h
@@ -37,14 +37,13 @@ extern "C" {
 typedef struct {
        orgNeardAdp             *proxy;         /* The proxy connected to Neard
                                                Adapter interface */
-       char                    *name;          /* DBus interface name
+       gchar                   *name;          /* DBus interface name
                                                (as id) */
        neardal_t               parent;
        gboolean                polling;        /* adapter polling active ? */
        gboolean                powered;        /* adapter powered ? */
        gchar                   **protocols;    /* protocols list */
        gsize                   lenProtocols;
-//     gchar                   **tgtArray;     /* temporary storage */
        gsize                   tgtNb;
        GList                   *tgtList;       /* Neard adapter targets list
                                                available */
@@ -53,14 +52,14 @@ typedef struct {
 /******************************************************************************
  * neardal_adp_prv_get_target: Get NEARDAL target from name
  *****************************************************************************/
-errorCode_t neardal_adp_prv_get_target(AdpProp *adpProp, char *tgtName,
+errorCode_t neardal_adp_prv_get_target(AdpProp *adpProp, gchar *tgtName,
                                       TgtProp **tgtProp);
 
 /******************************************************************************
  * neardal_adp_add: add new NEARDAL adapter, initialize DBus Proxy
  * connection, register adapter signal
  *****************************************************************************/
-errorCode_t neardal_adp_add(neardal_t neardalMgr, char *adapterName);
+errorCode_t neardal_adp_add(neardal_t neardalMgr, gchar *adapterName);
 
 /******************************************************************************
  * neardal_adp_remove: remove NEARDAL adapter, unref DBus Proxy

diff --git a/lib/neardal_manager.c b/lib/neardal_manager.c
index d11855c..196e74f 100644 (file)
--- a/lib/neardal_manager.c
+++ b/lib/neardal_manager.c
@@ -156,9 +156,8 @@ static errorCode_t neardal_mgr_prv_get_all_adapters(neardal_t neardalMgr,
 /******************************************************************************
  * neardal_mgr_prv_get_adapter: Get NFC Adapter from name
  *****************************************************************************/
-errorCode_t neardal_mgr_prv_get_adapter(neardal_t neardalMgr,
-                                            const char *adpName,
-                                            AdpProp **adpProp)
+errorCode_t neardal_mgr_prv_get_adapter(neardal_t neardalMgr, gchar *adpName,
+                                       AdpProp **adpProp)
 {
        errorCode_t     errCode = NEARDAL_ERROR_NO_ADAPTER;
        guint           len     = 0;
@@ -219,9 +218,8 @@ errorCode_t neardal_mgr_prv_get_adapter_from_proxy(neardal_t neardalMgr,
 /******************************************************************************
  * neardal_mgr_prv_get_target: Get specific target from adapter
  *****************************************************************************/
-errorCode_t neardal_mgr_prv_get_target(AdpProp *adpProp,
-                                           const char *tgtName,
-                                           TgtProp **tgtProp)
+errorCode_t neardal_mgr_prv_get_target(AdpProp *adpProp, gchar *tgtName,
+                                      TgtProp **tgtProp)
 {
        errorCode_t     errCode = NEARDAL_ERROR_NO_TARGET;
        guint           len;
@@ -250,9 +248,8 @@ errorCode_t neardal_mgr_prv_get_target(AdpProp *adpProp,
 /******************************************************************************
  * neardal_mgr_prv_get_record: Get specific record from target
  *****************************************************************************/
-errorCode_t neardal_mgr_prv_get_record(TgtProp *tgtProp,
-                                           const char *rcdName,
-                                           RcdProp **rcdProp)
+errorCode_t neardal_mgr_prv_get_record(TgtProp *tgtProp, gchar *rcdName,
+                                      RcdProp **rcdProp)
 {
        errorCode_t     errCode = NEARDAL_ERROR_NO_RECORD;
        guint           len;

diff --git a/lib/neardal_manager.h b/lib/neardal_manager.h
index 993947d..5c1fdcb 100644 (file)
--- a/lib/neardal_manager.h
+++ b/lib/neardal_manager.h
@@ -44,7 +44,7 @@ typedef struct {
  * neardal_mgr_prv_get_adapter: Get NEARDAL Adapter from name
  *****************************************************************************/
 errorCode_t neardal_mgr_prv_get_adapter(neardal_t neardalMgr,
-                                            const char *adpName,
+                                            gchar *adpName,
                                             AdpProp **adpProp);
 
 /******************************************************************************
@@ -57,16 +57,14 @@ errorCode_t neardal_mgr_prv_get_adapter_from_proxy(neardal_t neardalMgr,
 /******************************************************************************
  * neardal_mgr_prv_get_target: Get specific target from adapter
  *****************************************************************************/
-errorCode_t neardal_mgr_prv_get_target(AdpProp *adpProp,
-                                           const char *tgtName,
-                                           TgtProp **tgtProp);
+errorCode_t neardal_mgr_prv_get_target(AdpProp *adpProp, gchar *tgtName,
+                                      TgtProp **tgtProp);
 
 /******************************************************************************
  * neardal_mgr_prv_get_record: Get specific record from target
  *****************************************************************************/
-errorCode_t neardal_mgr_prv_get_record(TgtProp *tgtProp,
-                                           const char *rcdName,
-                                           RcdProp **rcdProp);
+errorCode_t neardal_mgr_prv_get_record(TgtProp *tgtProp, gchar *rcdName,
+                                      RcdProp **rcdProp);
 
 /******************************************************************************
  * neardal_mgr_create: Get Neard Manager Properties = NEARDAL Adapters list.

diff --git a/lib/neardal_record.h b/lib/neardal_record.h
index dd6bf2a..8527db0 100644 (file)
--- a/lib/neardal_record.h
+++ b/lib/neardal_record.h
@@ -32,19 +32,19 @@ extern "C" {
 /* NEARDAL Record Properties */
 typedef struct {
        orgNeardRcd     *proxy; /* proxy to Neard NFC Record interface */
-       char            *name;  /* DBus interface name (as identifier) */
+       gchar           *name;  /* DBus interface name (as identifier) */
        void            *parent; /* parent (target) */
        gboolean        notified; /* Already notified to client? */
 
-       char            *encoding;
+       gchar           *encoding;
        gboolean        handOver;
-       char            *language;
+       gchar           *language;
        gboolean        smartPoster;
-       char            *action;
-       char            *type;
-       char            *representation;
-       char            *uri;
-       char            *mime;
+       gchar           *action;
+       gchar           *type;
+       gchar           *representation;
+       gchar           *uri;
+       gchar           *mime;
 } RcdProp;
 
 /******************************************************************************

diff --git a/lib/neardal_target.h b/lib/neardal_target.h
index 670f782..e783e14 100644 (file)
--- a/lib/neardal_target.h
+++ b/lib/neardal_target.h
@@ -35,7 +35,7 @@ extern "C" {
 /* NEARDAL Target Properties */
 typedef struct {
        orgNeardTgt     *proxy;   /* proxy to Neard NEARDAL Target interface */
-       char            *name;    /* DBus interface name (as identifier) */
+       gchar           *name;    /* DBus interface name (as identifier) */
        void            *parent;  /* parent (adapter ) */
        gboolean        notified; /* Already notified to client? */