Menu
▾
▴
[Opensync-commits] r1096 - in trunk: libsyncml libsyncml/data_sync_api libsyncml/dev_inf_api libsyncml/parser tests
|
From: <svn...@op...> - 2009-06-19 10:05:57
|
Author: bellmich Date: Fri Jun 19 12:05:52 2009 New Revision: 1096 URL: http://libsyncml.opensync.org/changeset/1096 Log: fixed several flaws introduced during the GObject migration - g_type_init should be called internally - GError->message must not be used as format for printf functions - wrong error check (sml_dev_inf_function instead of !sml_dev_inf_function) - the variable length was overwritten in sml_xml_assm.c - a for loop declaration was followed by a semicolon - GError was received but not copied to SmlError - GError->code was ignored (not copied to SmlError->code) Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c trunk/libsyncml/parser/sml_xml_assm.c trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_devinf.c trunk/tests/check_dev_inf_content_type.c trunk/tests/check_dev_inf_prop_param.c trunk/tests/check_dev_inf_property.c Modified: trunk/libsyncml/data_sync_api/data_sync_devinf.c ============================================================================== --- trunk/libsyncml/data_sync_api/data_sync_devinf.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/data_sync_api/data_sync_devinf.c Fri Jun 19 12:05:52 2009 (r1096) @@ -39,7 +39,7 @@ } GError *gerror = NULL; if (!sml_dev_inf_property_set_prop_name(prop, name, &gerror)) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } @@ -75,7 +75,7 @@ return prop; error: if (gerror) { - smlErrorSet(error, gerror->code, gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); } smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); @@ -108,7 +108,7 @@ return param; error: if (gerror) { - smlErrorSet(error, gerror->code, gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); } smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); @@ -116,14 +116,14 @@ } #define _ADD_PROPERTY_VAL_ENUM(text) \ - if (sml_dev_inf_property_add_val_enum(prop, text, &gerror)) \ + if (!sml_dev_inf_property_add_val_enum(prop, text, &gerror)) \ goto error; #define _ADD_PROPERTY_PARAM(text) \ param = _add_property_param(prop, text, error); \ if (!param) \ goto error; #define _ADD_PROP_PARAM_VAL_ENUM(text) \ - if (sml_dev_inf_prop_param_add_val_enum(param, text, &gerror)) \ + if (!sml_dev_inf_prop_param_add_val_enum(param, text, &gerror)) \ goto error; #define _ADD_CTCAP_PROPERTY_BY_NAME(text) \ prop = _add_ctcap_property_by_name(ctcap, text, error); \ @@ -441,7 +441,7 @@ return TRUE; error: if (gerror) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); } smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); @@ -496,14 +496,14 @@ // because the most cellphones support it ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCARD_30, "3.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } smlDevInfDataStoreAddRx(ds, ctype); ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCARD_30, "3.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } @@ -519,14 +519,14 @@ { ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCARD_30, "2.1", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } smlDevInfDataStoreAddRx(ds, ctype); ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCARD_30, "2.1", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } @@ -542,14 +542,14 @@ { ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_ICAL, "2.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } smlDevInfDataStoreAddRx(ds, ctype); ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_ICAL, "2.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } @@ -565,14 +565,14 @@ { ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCAL, "1.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } smlDevInfDataStoreAddRx(ds, ctype); ctype = sml_dev_inf_content_type_new(SML_ELEMENT_TEXT_VCAL, "1.0", &gerror); if (!ctype) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error; } Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_content_type.c Fri Jun 19 12:05:52 2009 (r1096) @@ -135,6 +135,7 @@ const gchar* verct, GError **error) { + g_type_init(); SmlDevInfContentType* self = g_object_new (SML_TYPE_DEV_INF_CONTENT_TYPE, NULL); self->priv->cttype = g_strdup(cttype); self->priv->verct = g_strdup(verct); Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_prop_param.c Fri Jun 19 12:05:52 2009 (r1096) @@ -186,6 +186,7 @@ SmlDevInfPropParam* sml_dev_inf_prop_param_new (void) { + g_type_init(); return g_object_new (SML_TYPE_DEV_INF_PROP_PARAM, NULL); } Modified: trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c ============================================================================== --- trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/dev_inf_api/sml_dev_inf_property.c Fri Jun 19 12:05:52 2009 (r1096) @@ -295,6 +295,7 @@ SmlDevInfProperty* sml_dev_inf_property_new (void) { + g_type_init(); return g_object_new (SML_TYPE_DEV_INF_PROPERTY, NULL); } Modified: trunk/libsyncml/parser/sml_xml_assm.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_assm.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/parser/sml_xml_assm.c Fri Jun 19 12:05:52 2009 (r1096) @@ -2138,9 +2138,9 @@ goto error; // add values - guint length = sml_dev_inf_property_num_val_enums(property); + gsize propValEnumCount = sml_dev_inf_property_num_val_enums(property); guint n; - for (n = 0; n < length; n++) + for (n = 0; n < propValEnumCount; n++) { const char *valEnum = sml_dev_inf_property_get_nth_val_enum(property, n); @@ -2151,10 +2151,13 @@ } // end values for loop // add parameters - length = sml_dev_inf_property_num_params(property); - for (n = 0; n < length; n++); + gsize propParamCount = sml_dev_inf_property_num_params(property); + smlTrace(TRACE_INTERNAL, "%s: property params ::= %d", __func__, propParamCount); + for (n = 0; n < propParamCount; n++) { + smlTrace(TRACE_INTERNAL, "%s: property param ::= %d", __func__, n); SmlDevInfPropParam *param = sml_dev_inf_property_get_nth_param(property, n); + smlAssert(param); if (!flat) { @@ -2179,9 +2182,9 @@ goto error; // add values - guint length = sml_dev_inf_prop_param_num_val_enums(param); + gsize propParamValEnumCount = sml_dev_inf_prop_param_num_val_enums(param); guint nn; - for (nn=0; nn < length; nn++) + for (nn=0; nn < propParamValEnumCount; nn++) { const char *valEnum = sml_dev_inf_prop_param_get_nth_val_enum(param, nn); Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/parser/sml_xml_parse.c Fri Jun 19 12:05:52 2009 (r1096) @@ -2827,7 +2827,7 @@ goto error; } } - if (param != NULL && sml_dev_inf_property_add_param(property, param, &gerror)) + if (param != NULL && !sml_dev_inf_property_add_param(property, param, &gerror)) goto error; if (property != NULL) smlDevInfCTCapAddProperty(ctcap, property); @@ -2839,7 +2839,7 @@ error: if (gerror) { - smlErrorSet(error, gerror->code, gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); } smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); @@ -3042,7 +3042,7 @@ error: if (gerror) { - smlErrorSet(error, gerror->code, gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); } smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error)); @@ -3285,7 +3285,7 @@ if (verct) smlSafeCFree(&verct); if (!ct) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error_free_datastore; } @@ -3304,7 +3304,7 @@ if (verct) smlSafeCFree(&verct); if (!ct) { - smlErrorSet(error, SML_ERROR_GENERIC, "%s", gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); g_error_free(gerror); goto error_free_datastore; } Modified: trunk/libsyncml/sml_devinf.c ============================================================================== --- trunk/libsyncml/sml_devinf.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/libsyncml/sml_devinf.c Fri Jun 19 12:05:52 2009 (r1096) @@ -822,6 +822,8 @@ ctcap->ct = sml_dev_inf_content_type_new(NULL, NULL, &gerror); if (!ctcap->ct) { smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, gerror->message); + smlErrorSet(error, gerror->code, "%s", gerror->message); + g_error_free(gerror); smlSafeFree((gpointer *)&ctcap); return NULL; } Modified: trunk/tests/check_dev_inf_content_type.c ============================================================================== --- trunk/tests/check_dev_inf_content_type.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/tests/check_dev_inf_content_type.c Fri Jun 19 12:05:52 2009 (r1096) @@ -24,8 +24,6 @@ START_TEST (dev_inf_content_type_create) { - g_type_init(); - GError *error = NULL; SmlDevInfContentType *ct = sml_dev_inf_content_type_new(NULL, NULL, &error); sml_fail_unless(ct != NULL, "%s", error?error->message:"No GError set."); @@ -47,8 +45,6 @@ START_TEST (dev_inf_content_type_empty_get) { - g_type_init(); - GError *error = NULL; SmlDevInfContentType *ct = sml_dev_inf_content_type_new(NULL, NULL, &error); sml_fail_unless(ct != NULL, "%s", error?error->message:"No GError set."); @@ -62,8 +58,6 @@ START_TEST (dev_inf_content_type_filled_get) { - g_type_init(); - GError *error = NULL; SmlDevInfContentType *ct = sml_dev_inf_content_type_new("text/x-vCalendar", "1.0", &error); sml_fail_unless(ct != NULL, "%s", error?error->message:"No GError set."); @@ -77,8 +71,6 @@ START_TEST (dev_inf_content_type_references) { - g_type_init(); - GError *error = NULL; SmlDevInfContentType *ct = sml_dev_inf_content_type_new("text/x-vCalendar", "1.0", &error); sml_fail_unless(ct != NULL, "%s", error?error->message:"No GError set."); Modified: trunk/tests/check_dev_inf_prop_param.c ============================================================================== --- trunk/tests/check_dev_inf_prop_param.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/tests/check_dev_inf_prop_param.c Fri Jun 19 12:05:52 2009 (r1096) @@ -24,8 +24,6 @@ START_TEST (dev_inf_prop_param_create) { - g_type_init(); - SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); g_object_unref(propParam); @@ -34,8 +32,6 @@ START_TEST (dev_inf_prop_param_empty_set) { - g_type_init(); - GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); @@ -62,8 +58,6 @@ START_TEST (dev_inf_prop_param_empty_get) { - g_type_init(); - GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); @@ -94,8 +88,6 @@ START_TEST (dev_inf_prop_param_filled_set) { - g_type_init(); - GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); @@ -112,8 +104,6 @@ START_TEST (dev_inf_prop_param_filled_get) { - g_type_init(); - GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, NULL); @@ -153,8 +143,6 @@ START_TEST (dev_inf_prop_param_references) { - g_type_init(); - GError *error = NULL; SmlDevInfPropParam *propParam = sml_dev_inf_prop_param_new(); sml_fail_unless(propParam != NULL, "Cannot create SmlDevInfPropParam."); Modified: trunk/tests/check_dev_inf_property.c ============================================================================== --- trunk/tests/check_dev_inf_property.c Fri Jun 19 10:22:12 2009 (r1095) +++ trunk/tests/check_dev_inf_property.c Fri Jun 19 12:05:52 2009 (r1096) @@ -24,8 +24,6 @@ START_TEST (dev_inf_property_create) { - g_type_init(); - SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); g_object_unref(prop); @@ -34,8 +32,6 @@ START_TEST (dev_inf_property_empty_set) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); @@ -78,8 +74,6 @@ START_TEST (dev_inf_property_empty_get) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); @@ -132,8 +126,6 @@ START_TEST (dev_inf_property_size_integrity) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); @@ -169,8 +161,6 @@ START_TEST (dev_inf_property_filled_set) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); @@ -207,8 +197,6 @@ START_TEST (dev_inf_property_filled_get) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, NULL); @@ -288,8 +276,6 @@ START_TEST (dev_inf_property_references) { - g_type_init(); - GError *error = NULL; SmlDevInfProperty *prop = sml_dev_inf_property_new(); sml_fail_unless(prop != NULL, "Cannot create SmlDevInfProperty."); |
