celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1527977 - in /incubator/celix/trunk/framework/private: include/attribute.h src/attribute.c src/manifest_parser.c
Date Tue, 01 Oct 2013 09:02:40 GMT
Author: abroekhuis
Date: Tue Oct  1 09:02:40 2013
New Revision: 1527977

URL: http://svn.apache.org/r1527977
Log:
CELIX-56: Fixed some small code style problems

Modified:
    incubator/celix/trunk/framework/private/include/attribute.h
    incubator/celix/trunk/framework/private/src/attribute.c
    incubator/celix/trunk/framework/private/src/manifest_parser.c

Modified: incubator/celix/trunk/framework/private/include/attribute.h
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/include/attribute.h?rev=1527977&r1=1527976&r2=1527977&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/include/attribute.h (original)
+++ incubator/celix/trunk/framework/private/include/attribute.h Tue Oct  1 09:02:40 2013
@@ -31,7 +31,7 @@
 
 typedef struct attribute *attribute_pt;
 
-celix_status_t attribute_create(char * key, char * value, apr_pool_t *memory_pool, attribute_pt
*attribute);
+celix_status_t attribute_create(apr_pool_t *memory_pool, char * key, char * value, attribute_pt
*attribute);
 
 celix_status_t attribute_getKey(attribute_pt attribute, char **key);
 celix_status_t attribute_getValue(attribute_pt attribute, char **value);

Modified: incubator/celix/trunk/framework/private/src/attribute.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/attribute.c?rev=1527977&r1=1527976&r2=1527977&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/attribute.c (original)
+++ incubator/celix/trunk/framework/private/src/attribute.c Tue Oct  1 09:02:40 2013
@@ -33,7 +33,7 @@ struct attribute {
 	char * value;
 };
 
-celix_status_t attribute_create(char * key, char * value, apr_pool_t *memory_pool, attribute_pt
*attribute) {
+celix_status_t attribute_create(apr_pool_t *memory_pool, char * key, char * value, attribute_pt
*attribute) {
 	celix_status_t status = CELIX_SUCCESS;
 
 	if (key == NULL || value == NULL || memory_pool == NULL || *attribute != NULL) {

Modified: incubator/celix/trunk/framework/private/src/manifest_parser.c
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/manifest_parser.c?rev=1527977&r1=1527976&r2=1527977&view=diff
==============================================================================
--- incubator/celix/trunk/framework/private/src/manifest_parser.c (original)
+++ incubator/celix/trunk/framework/private/src/manifest_parser.c Tue Oct  1 09:02:40 2013
@@ -229,7 +229,7 @@ static linked_list_pt manifestParser_par
                         return NULL;
                     }
                     
-                    if (attribute_create(key, value, memory_pool, &attr) == CELIX_SUCCESS)
{
+                    if (attribute_create(memory_pool, key, value, &attr) == CELIX_SUCCESS)
{
                         hashMap_put(attrsMap, key, attr);
                     }
                 }
@@ -302,7 +302,7 @@ static linked_list_pt manifestParser_par
                     return NULL;
                 }
                 
-                if (attribute_create(apr_pstrdup(memory_pool, "service"), path, memory_pool,
&name) == CELIX_SUCCESS) {
+                if (attribute_create(memory_pool, apr_pstrdup(memory_pool, "service"), path,
&name) == CELIX_SUCCESS) {
                 	char *key = NULL;
                 	attribute_getKey(name, &key);
                     hashMap_put(attributes, key, name);
@@ -354,7 +354,7 @@ static linked_list_pt manifestParser_par
                 return NULL;
             }
 
-            if (attribute_create(apr_pstrdup(memory_pool, "service"), path, memory_pool,
&name) == CELIX_SUCCESS) {
+            if (attribute_create(memory_pool, apr_pstrdup(memory_pool, "service"), path,
&name) == CELIX_SUCCESS) {
             	char *key = NULL;
 				attribute_getKey(name, &key);
 				hashMap_put(attributes, key, name);



Mime
View raw message