Changeset 8565a42 in mainline for uspace/srv/devman/match.c

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:

• uspace/srv/devman/match.c (modified) (13 diffs)

uspace/srv/devman/match.c

@@ -69 +69 @@
         link_t *drv_head = &drv->match_ids.ids.head;
         link_t *dev_head = &dev->pfun->match_ids.ids.head;
-        
+
         if (list_empty(&drv->match_ids.ids) ||
             list_empty(&dev->pfun->match_ids.ids)) {
                 return 0;
         }
-        
+
         /*
          * Go through all pairs, return the highest score obtained.
          */
         int highest_score = 0;
-        
+
         link_t *drv_link = drv->match_ids.ids.head.next;
         while (drv_link != drv_head) {
@@ -86 +86 @@
                         match_id_t *drv_id = list_get_instance(drv_link, match_id_t, link);
                         match_id_t *dev_id = list_get_instance(dev_link, match_id_t, link);
-                        
+
                         int score = compute_match_score(drv_id, dev_id);
                         if (score > highest_score) {
@@ -94 +94 @@
                         dev_link = dev_link->next;
                 }
-                
+
                 drv_link = drv_link->next;
         }
-        
+
         return highest_score;
 }
@@ -111 +111 @@
         char *res = NULL;
         size_t len = get_nonspace_len(*buf);
-        
+
         if (len > 0) {
                 res = malloc(len + 1);
@@ -119 +119 @@
                 }
         }
-        
+
         return res;
 }
@@ -141 +141 @@
         char *id = NULL;
         int ids_read = 0;
-        
+
         while (true) {
                 /* skip spaces */
@@ -151 +151 @@
                         continue;
                 }
-                
+
                 /* read score */
                 score = strtoul(buf, &buf, 10);
-                
+
                 /* skip spaces */
                 if (!skip_spaces(&buf))
                         break;
-                
+
                 /* read id */
                 id = read_match_id(&buf);
                 if (NULL == id)
                         break;
-                
+
                 /* create new match_id structure */
                 match_id_t *mid = create_match_id();
                 mid->id = id;
                 mid->score = score;
-                
+
                 /* add it to the list */
                 add_match_id(ids, mid);
-                
+
                 ids_read++;
         }
-        
+
         return ids_read > 0;
 }
@@ -194 +194 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "read_match_ids(conf_path=\"%s\")", conf_path);
-        
+
         bool suc = false;
         char *buf = NULL;
@@ -201 +201 @@
         size_t len = 0;
         vfs_stat_t st;
-        
+
         errno_t rc = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ, &fd);
         if (rc != EOK) {
@@ -209 +209 @@
         }
         opened = true;
-        
+
         rc = vfs_stat(fd, &st);
         if (rc != EOK) {
@@ -222 +222 @@
                 goto cleanup;
         }
-        
+
         buf = malloc(len + 1);
         if (buf == NULL) {
@@ -229 +229 @@
                 goto cleanup;
         }
-        
+
         size_t read_bytes;
         rc = vfs_read(fd, (aoff64_t []) {0}, buf, len, &read_bytes);
@@ -238 +238 @@
         }
         buf[read_bytes] = 0;
-        
+
         suc = parse_match_ids(buf, ids);
-        
+
 cleanup:
         free(buf);
-        
+
         if (opened)
                 vfs_put(fd);
-        
+
         return suc;
 }