Changeset f1d6866 in mainline for uspace/lib/c/generic

Timestamp:

2011-09-18T21:22:59Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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/generic

Files:

• adt/hash_table.c (modified) (3 diffs)
• as.c (modified) (1 diff)
• cfg.c (added)
• io/io.c (modified) (1 diff)
• ns.c (modified) (1 diff)

uspace/lib/c/generic/adt/hash_table.c

@@ -152 +152 @@
         
         if (keys == h->max_keys) {
-                link_t *cur;
-                
                 /*
                  * All keys are known, hash_table_find() can be used to find the
@@ -159 +157 @@
                  */
                 
-                cur = hash_table_find(h, key);
+                link_t *cur = hash_table_find(h, key);
                 if (cur) {
                         list_remove(cur);
@@ -174 +172 @@
         hash_index_t chain;
         for (chain = 0; chain < h->entries; chain++) {
-                link_t *cur;
-                
-                for (cur = h->entry[chain].head.next; cur != &h->entry[chain].head;
+                for (link_t *cur = h->entry[chain].head.next;
+                    cur != &h->entry[chain].head;
                     cur = cur->next) {
                         if (h->op->compare(key, keys, cur)) {

uspace/lib/c/generic/as.c

@@ -123 +123 @@
  * @retval ENOENT Mapping not found.
  */
-int as_get_physical_mapping(void *address, uintptr_t *frame)
+int as_get_physical_mapping(const void *address, uintptr_t *frame)
 {
         uintptr_t tmp_frame;

uspace/lib/c/generic/io/io.c

@@ -418 +418 @@
 
         bytes_used = stream->buf_head - stream->buf_tail;
-        if (bytes_used == 0)
-                return;
 
         /* If buffer has prefetched read data, we need to seek back. */
-        if (stream->buf_state == _bs_read)
+        if (bytes_used > 0 && stream->buf_state == _bs_read)
                 lseek(stream->fd, - (ssize_t) bytes_used, SEEK_CUR);
 
         /* If buffer has unwritten data, we need to write them out. */
-        if (stream->buf_state == _bs_write)
+        if (bytes_used > 0 && stream->buf_state == _bs_write)
                 (void) _fwrite(stream->buf_tail, 1, bytes_used, stream);
 

uspace/lib/c/generic/ns.c

@@ -52 +52 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
         async_sess_t *sess =
             async_connect_me_to(mgmt, exch, service, arg2, arg3);
         async_exchange_end(exch);
+
+        if (!sess)
+                return NULL;
         
         /*