Changeset 442ebbe in mainline

Timestamp:

2010-12-04T14:15:20Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc3dba14

Parents:

3bb5735

Message:

Cstyle fixes.

Location:

uspace/lib/c

Files:

• generic/adt/char_map.c (modified) (4 diffs)
• include/adt/generic_field.h (modified) (2 diffs)

uspace/lib/c/generic/adt/char_map.c

@@ -90 +90 @@
         }
 
-        map->items[map->next]->c = * identifier;
-        ++ identifier;
-        ++ map->next;
-        if ((length > 1) || ((length == 0) && (*identifier))) {
+        map->items[map->next]->c = *identifier;
+        identifier++;
+        map->next++;
+        if ((length > 1) || ((length == 0) && *identifier)) {
                 map->items[map->next - 1]->value = CHAR_MAP_NULL;
                 return char_map_add_item(map->items[map->next - 1], identifier,
@@ -142 +142 @@
     const int value)
 {
-        if (char_map_is_valid(map) && (identifier) &&
-            ((length) || (*identifier))) {
+        if (char_map_is_valid(map) && identifier && (length || *identifier)) {
                 int index;
 
-                for (index = 0; index < map->next; ++ index) {
+                for (index = 0; index < map->next; index++) {
                         if (map->items[index]->c != *identifier)
                                 continue;
                                 
-                        ++ identifier;
-                        if((length > 1) || ((length == 0) && (*identifier))) {
+                        identifier++;
+                        if((length > 1) || ((length == 0) && *identifier)) {
                                 return char_map_add(map->items[index],
                                     identifier, length ? length - 1 : 0, value);
@@ -178 +177 @@
 
                 map->magic = 0;
-                for (index = 0; index < map->next; ++index)
+                for (index = 0; index < map->next; index++)
                         char_map_destroy(map->items[index]);
 
@@ -207 +206 @@
                 return NULL;
 
-        if (length || (*identifier)) {
+        if (length || *identifier) {
                 int index;
 
-                for (index = 0; index < map->next; ++index) {
+                for (index = 0; index < map->next; index++) {
                         if (map->items[index]->c == *identifier) {
-                                ++identifier;
+                                identifier++;
                                 if (length == 1)
                                         return map->items[index];

uspace/lib/c/include/adt/generic_field.h

@@ -91 +91 @@
                         } \
                         field->items[field->next] = value; \
-                        ++field->next; \
+                        field->next++; \
                         field->items[field->next] = NULL; \
                         return field->next - 1; \
@@ -108 +108 @@
                         int index; \
                         field->magic = 0; \
-                        for (index = 0; index < field->next; ++ index) { \
+                        for (index = 0; index < field->next; index++) { \
                                 if (field->items[index]) \
                                         free(field->items[index]); \