Changeset 87b4baa in mainline for uspace/lib/c/generic/adt/char_map.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/generic/adt/char_map.c (modified) (4 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];