diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2007-05-02 14:06:39 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2007-05-02 14:06:39 +0000 |
| commit | 84dfade8f0a94d70d303b2620be75abe64fb54be (patch) | |
| tree | ab64631db0cb18cbdfb41a1cafba28caf9505343 | |
| parent | a654dc636348af0c1baddd37b54febf373240a02 (diff) | |
| download | lasso-84dfade8f0a94d70d303b2620be75abe64fb54be.tar.gz lasso-84dfade8f0a94d70d303b2620be75abe64fb54be.tar.xz lasso-84dfade8f0a94d70d303b2620be75abe64fb54be.zip | |
replaced status codes with constants
| -rw-r--r-- | lasso/id-wsf-2.0/discovery.c | 16 | ||||
| -rw-r--r-- | lasso/id-wsf/discovery.c | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c index 9bfa58e1..e2c50245 100644 --- a/lasso/id-wsf-2.0/discovery.c +++ b/lasso/id-wsf-2.0/discovery.c @@ -158,13 +158,12 @@ lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdWsf2Discovery *disco response = LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE( lasso_idwsf2_disco_svc_md_register_response_new()); - /* FIXME : Replace status codes with a constant ? */ if (res == 0) { - response->Status = lasso_util_status_new("OK"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK); /* FIXME : foreach here as well */ response->SvcMDID = g_list_append(response->SvcMDID, discovery->metadata->svcMDID); } else { - response->Status = lasso_util_status_new("Failed"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED); /* XXX : May add secondary status codes here */ } @@ -309,11 +308,11 @@ lasso_idwsf2_discovery_process_metadata_association_add_msg(LassoIdWsf2Discovery /* Build response */ response = LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD_RESPONSE( lasso_idwsf2_disco_svc_md_association_add_response_new()); - /* FIXME : Replace status codes with a constant ? */ + if (res == 0) { - response->Status = lasso_util_status_new("OK"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK); } else { - response->Status = lasso_util_status_new("Failed"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED); /* XXX : May add secondary status codes here */ } @@ -499,9 +498,8 @@ lasso_idwsf2_discovery_process_query_msg(LassoIdWsf2Discovery *discovery, const response = LASSO_IDWSF2_DISCO_QUERY_RESPONSE( lasso_idwsf2_disco_query_response_new()); - /* FIXME : Replace status codes with a constant ? */ if (res == 0) { - response->Status = lasso_util_status_new("OK"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK); /* FIXME : foreach here as well */ epr = lasso_idwsf2_discovery_build_query_response_epr(service, identity); if (epr != NULL) { @@ -509,7 +507,7 @@ lasso_idwsf2_discovery_process_query_msg(LassoIdWsf2Discovery *discovery, const g_list_append(response->EndpointReference, epr); } } else { - response->Status = lasso_util_status_new("Failed"); + response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED); /* XXX : May add secondary status codes here */ } diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c index 8da5cebf..7abb9e25 100644 --- a/lasso/id-wsf/discovery.c +++ b/lasso/id-wsf/discovery.c @@ -767,7 +767,7 @@ lasso_discovery_process_modify_response_msg(LassoDiscovery *discovery, const gch } response = LASSO_DISCO_MODIFY_RESPONSE(LASSO_WSF_PROFILE(discovery)->response); - if (strcmp(response->Status->code, "OK") != 0) { + if (strcmp(response->Status->code, LASSO_DISCO_STATUS_CODE_OK) != 0) { return LASSO_PROFILE_ERROR_STATUS_NOT_SUCCESS; } @@ -911,7 +911,7 @@ lasso_discovery_process_query_response_msg(LassoDiscovery *discovery, const gcha } response = LASSO_DISCO_QUERY_RESPONSE(LASSO_WSF_PROFILE(discovery)->response); - if (strcmp(response->Status->code, "OK") != 0) { + if (strcmp(response->Status->code, LASSO_DISCO_STATUS_CODE_OK) != 0) { return LASSO_PROFILE_ERROR_STATUS_NOT_SUCCESS; } |