From 550f27dbdbd00024e483b989ebc033b2cbe0d239 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 3 Jul 2009 12:19:12 -0400 Subject: Clean up warnings in common/ Fix consts and function declarations --- common/collection/collection_cnv.c | 75 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 37 deletions(-) (limited to 'common/collection/collection_cnv.c') diff --git a/common/collection/collection_cnv.c b/common/collection/collection_cnv.c index 1a70600e9..e60935aeb 100644 --- a/common/collection/collection_cnv.c +++ b/common/collection/collection_cnv.c @@ -39,10 +39,10 @@ int col_insert_str_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, - char *string, + const char *string, int length) { int error = EOK; @@ -55,11 +55,11 @@ int col_insert_str_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_STRING, - (void *)string, + (const void *)string, length, NULL); @@ -72,7 +72,7 @@ int col_insert_binary_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, void *binary_data, @@ -86,7 +86,7 @@ int col_insert_binary_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_BINARY, @@ -104,7 +104,7 @@ int col_insert_int_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, int number) @@ -117,7 +117,7 @@ int col_insert_int_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_INTEGER, @@ -135,7 +135,7 @@ int col_insert_unsigned_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned number) @@ -148,7 +148,7 @@ int col_insert_unsigned_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_UNSIGNED, @@ -166,7 +166,7 @@ int col_insert_long_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, long number) @@ -179,7 +179,7 @@ int col_insert_long_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_LONG, @@ -196,7 +196,7 @@ int col_insert_ulong_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned long number) @@ -209,7 +209,7 @@ int col_insert_ulong_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_ULONG, @@ -226,7 +226,7 @@ int col_insert_double_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, double number) @@ -239,7 +239,7 @@ int col_insert_double_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_DOUBLE, @@ -256,7 +256,7 @@ int col_insert_bool_property(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned char logical) @@ -269,7 +269,7 @@ int col_insert_bool_property(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_BOOL, @@ -287,7 +287,7 @@ int col_insert_str_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, char *string, @@ -304,7 +304,7 @@ int col_insert_str_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_STRING, @@ -321,7 +321,7 @@ int col_insert_binary_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, void *binary_data, @@ -336,7 +336,7 @@ int col_insert_binary_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_BINARY, @@ -353,7 +353,7 @@ int col_insert_int_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, int number, @@ -367,7 +367,7 @@ int col_insert_int_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_INTEGER, @@ -385,7 +385,7 @@ int col_insert_unsigned_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned number, @@ -399,7 +399,7 @@ int col_insert_unsigned_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_UNSIGNED, @@ -416,7 +416,7 @@ int col_insert_long_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, long number, @@ -430,7 +430,7 @@ int col_insert_long_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_LONG, @@ -447,7 +447,7 @@ int col_insert_ulong_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned long number, @@ -461,7 +461,7 @@ int col_insert_ulong_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_ULONG, @@ -478,7 +478,7 @@ int col_insert_double_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, double number, @@ -492,7 +492,7 @@ int col_insert_double_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_DOUBLE, @@ -509,7 +509,7 @@ int col_insert_bool_property_with_ref(struct collection_item *ci, const char *subcollection, int disposition, const char *refprop, - int index, + int idx, unsigned flags, const char *property, unsigned char logical, @@ -523,7 +523,7 @@ int col_insert_bool_property_with_ref(struct collection_item *ci, subcollection, disposition, refprop, - index, + idx, flags, property, COL_TYPE_BOOL, @@ -540,7 +540,7 @@ int col_insert_bool_property_with_ref(struct collection_item *ci, int col_add_str_property(struct collection_item *ci, const char *subcollection, const char *property, - char *string, + const char *string, int length) { int error = EOK; @@ -1141,7 +1141,7 @@ int col_modify_item_property(struct collection_item *item, /* Modify item data to be str */ int col_modify_str_item(struct collection_item *item, const char *property, - char *string, + const char *string, int length) { int len; @@ -1152,7 +1152,8 @@ int col_modify_str_item(struct collection_item *item, if (length != 0) len = length; else len = strlen(string) + 1; - error = col_modify_item(item, property, COL_TYPE_STRING, (void *)string, len); + error = col_modify_item(item, property, + COL_TYPE_STRING, (const void *)string, len); TRACE_FLOW_STRING("col_modify_str_item", "Exit"); return error; -- cgit