diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-09-27 16:18:05 +0200 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2010-09-27 16:18:30 +0200 |
| commit | b4e04a07165557b7193f715d55a31dfdd287d7ec (patch) | |
| tree | be1243e95e66cc8ad5cfa366142a04c383e67347 /lasso | |
| parent | 6cc9ae7e32228322ca3ae2d15fa23c350f9ffdca (diff) | |
| download | lasso-b4e04a07165557b7193f715d55a31dfdd287d7ec.tar.gz lasso-b4e04a07165557b7193f715d55a31dfdd287d7ec.tar.xz lasso-b4e04a07165557b7193f715d55a31dfdd287d7ec.zip | |
[ID-WSFv1] fix other misuses of the macro lasso_foreach
Diffstat (limited to 'lasso')
| -rw-r--r-- | lasso/id-wsf/data_service.c | 5 | ||||
| -rw-r--r-- | lasso/id-wsf/personal_profile_service.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c index 05b3fa1a..1ab655cf 100644 --- a/lasso/id-wsf/data_service.c +++ b/lasso/id-wsf/data_service.c @@ -1040,6 +1040,7 @@ lasso_data_service_apply_queries(LassoDataService *service, LassoDstQueryRespons LassoWsfProfile *wsf_profile = NULL; xmlDoc *doc = NULL; xmlXPathContext *xpathCtx = NULL; + GList *query = NULL; lasso_bad_param(DATA_SERVICE, service); g_return_val_if_fail(service->private_data, LASSO_PARAM_ERROR_NON_INITIALIZED_OBJECT); @@ -1067,8 +1068,8 @@ lasso_data_service_apply_queries(LassoDataService *service, LassoDstQueryRespons xpathCtx = xmlXPathNewContext(doc); lasso_register_idwsf_xpath_namespaces(xpathCtx); - lasso_foreach (queries, queries) { - LassoDstQueryItem *item = queries->data; + lasso_foreach (query, queries) { + LassoDstQueryItem *item = query->data; goto_cleanup_if_fail_with_rc(lasso_data_service_apply_query(service, query_response, xpathCtx, item) == 0, query_response->Data ? diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c index 46610d8a..3aa558c8 100644 --- a/lasso/id-wsf/personal_profile_service.c +++ b/lasso/id-wsf/personal_profile_service.c @@ -46,7 +46,7 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service) xmlNode *xmlnode, *child; xmlChar *msgAccount = NULL, *msgProvider = NULL; char *email; - GList *answers = NULL; + GList *answers = NULL, *answer = NULL; gint rc = 0; g_return_val_if_fail(LASSO_IS_PERSONAL_PROFILE_SERVICE(service) == TRUE, NULL); @@ -54,9 +54,9 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service) rc = lasso_data_service_get_answers_by_select(LASSO_DATA_SERVICE(service), "/pp:PP/pp:MsgContact", &answers); - lasso_foreach(answers, answers) + lasso_foreach(answer, answers) { - xmlnode = (xmlNode*)answers->data; + xmlnode = (xmlNode*)answer->data; child = xmlnode->children; while (child != NULL) { if (child->type != XML_ELEMENT_NODE) { |