Apis neardal_start_poll(), neardal_stop_poll() returns now an error Code (instead...

diff --git a/lib/neardal.c b/lib/neardal.c
index 209a8c2..d17d1d9 100644 (file)
--- a/lib/neardal.c
+++ b/lib/neardal.c
@@ -205,7 +205,7 @@ errorCode_t neardal_free_array(char ***array)
 /******************************************************************************
  * neardal_start_poll: Request Neard to start polling
  *****************************************************************************/
-void neardal_start_poll(char *adpName, errorCode_t *ec)
+errorCode_t neardal_start_poll(char *adpName)
 {
        errorCode_t     err             = NEARDAL_SUCCESS;
        AdpProp         *adpProp        = NULL;
@@ -213,7 +213,7 @@ void neardal_start_poll(char *adpName, errorCode_t *ec)
        if (neardalMgr.proxy == NULL)
                neardal_prv_construct(&err);
        if (err != NEARDAL_SUCCESS)
-               return;
+               return err;
        
        err = neardal_mgr_prv_get_adapter(adpName, &adpProp);
 
@@ -241,14 +241,13 @@ void neardal_start_poll(char *adpName, errorCode_t *ec)
                err = NEARDAL_ERROR_POLLING_ALREADY_ACTIVE;
 
 exit:
-       if (ec != NULL)
-               *ec = err;
+       return err;
 }
 
 /******************************************************************************
  * neardal_stop_poll: Request Neard to stop polling
  *****************************************************************************/
-void neardal_stop_poll(char *adpName, errorCode_t *ec)
+errorCode_t neardal_stop_poll(char *adpName)
 {
        errorCode_t     err = NEARDAL_SUCCESS;
        AdpProp         *adpProp        = NULL;
@@ -281,8 +280,7 @@ void neardal_stop_poll(char *adpName, errorCode_t *ec)
        }
 
 exit:
-       if (ec != NULL)
-               *ec = err;
+       return err;
 }
 
 /******************************************************************************

diff --git a/lib/neardal.h b/lib/neardal.h
index f2f1eb5..725a15a 100644 (file)
--- a/lib/neardal.h
+++ b/lib/neardal.h
@@ -177,19 +177,19 @@ typedef void (*record_cb) (const char *rcdName, void *user_data);
 */
 void neardal_destroy();
 
-/*! \fn void neardal_start_poll(char *adpName, errorCode_t *ec)
+/*! \fn errorCode_t neardal_start_poll(char *adpName)
 *  \brief Request Neard to start polling on specific NEARDAL adapter
 *  \param adpName : DBus interface adapter name (as identifier)
-*  \param ec : optional, pointer to store error code
+*  @return errorCode_t error code
 */
-void neardal_start_poll(char *adpName, errorCode_t *ec);
+errorCode_t neardal_start_poll(char *adpName);
 
-/*! \fn void neardal_stop_poll(char *adpName, errorCode_t *ec)
+/*! \fn errorCode_t neardal_stop_poll(char *adpName)
 *  \brief Request Neard to stop polling on specific NEARDAL adapter
 *  \param adpName : DBus interface adapter name (as identifier)
-*  \param ec : optional, pointer to store error code
+*  @return errorCode_t error code
 */
-void neardal_stop_poll(char *adpName, errorCode_t *ec);
+errorCode_t neardal_stop_poll(char *adpName);
 
 /*! \fn errorCode_t neardal_get_adapters(char ***array, int *len)
  * @brief get an array of NEARDAL adapters present

diff --git a/lib/neardal_adapter.h b/lib/neardal_adapter.h
index 4b55e72..1a44ccc 100644 (file)
--- a/lib/neardal_adapter.h
+++ b/lib/neardal_adapter.h
@@ -39,7 +39,7 @@ typedef struct {
                                                Adapter interface */
        gchar                   *name;          /* DBus interface name
                                                (as id) */
-       neardal_t               parent;
+       void                    *parent;
        gboolean                polling;        /* adapter polling active ? */
        gboolean                powered;        /* adapter powered ? */
        gchar                   **protocols;    /* protocols list */

diff --git a/ncl/ncl_cmd.c b/ncl/ncl_cmd.c
index d143523..b3ee194 100644 (file)
--- a/ncl/ncl_cmd.c
+++ b/ncl/ncl_cmd.c
@@ -722,7 +722,7 @@ static NCLError ncl_cmd_neardal_start_poll(int argc, char *argv[])
 
        /* Start polling if adapter present */
        adpName = argv[1];
-       neardal_start_poll(adpName, &ec);
+       ec = neardal_start_poll(adpName);
        if (ec != NEARDAL_SUCCESS) {
                NCL_CMD_PRINTF("NFC polling activation error:%d='%s'\n",
                                ec, neardal_error_get_text(ec));
@@ -755,7 +755,7 @@ static NCLError ncl_cmd_neardal_stop_poll(int argc, char *argv[])
                ncl_cmd_install_callback();
 
        adpName = argv[1];
-       neardal_stop_poll(adpName, &ec);
+       ec = neardal_stop_poll(adpName);
        if (ec != NEARDAL_SUCCESS) {
                NCL_CMD_PRINTF("Stop NFC polling error:%d='%s'.\n", ec,
                               neardal_error_get_text(ec));