Changeset fe2333d in mainline for uspace/lib/c

Timestamp:

2010-12-09T00:08:57Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a5a950

Parents:

07b9203e (diff), c01f8e6 (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

Location:

uspace/lib/c

Files:

• generic/adt/char_map.c (modified) (4 diffs)
• generic/devman.c (modified) (1 diff)
• include/adt/generic_field.h (modified) (2 diffs)
• include/errno.h (modified) (1 diff)
• include/ipc/vfs.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/generic/devman.c

@@ -116 +116 @@
 {
         ipc_call_t answer;
-        async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
+        aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer);
         int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id));
-        return retval;  
+        async_wait_for(req, NULL);
+        return retval;
 }
 

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]); \

uspace/lib/c/include/errno.h

@@ -83 +83 @@
 #define ENOTCONN        (-10057)
 
-/** The requested operation was not performed.
- *  Try again later.
- */
-#define TRY_AGAIN       (-11002)
+/** The requested operation was not performed. Try again later. */
+#define EAGAIN          (-11002)
 
 /** No data.

uspace/lib/c/include/ipc/vfs.h

@@ -36 +36 @@
 #define LIBC_IPC_VFS_H_
 
+#include <ipc/ipc.h>
 #include <sys/types.h>
-#include <ipc/ipc.h>
+#include <bool.h>
 
 #define FS_NAME_MAXLEN  20
@@ -55 +56 @@
         /** Unique identifier of the fs. */
         char name[FS_NAME_MAXLEN + 1];
+        bool concurrent_read_write;
+        bool write_retains_size;
 } vfs_info_t;