Changeset 3d23553 in mainline

Timestamp:

2012-03-01T22:57:09Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5869ce0

Parents:

4546fc3

Message:

cstyle

Location:

kernel/generic/src/sysinfo

Files:

• stats.c (modified) (2 diffs)
• sysinfo.c (modified) (6 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -249 +249 @@
         ASSERT(interrupts_disabled());
         ASSERT(irq_spinlock_locked(&task->lock));
-
+        
         stats_task->task_id = task->taskid;
         str_cpy(stats_task->name, TASK_NAME_BUFLEN, task->name);
@@ -350 +350 @@
         ASSERT(interrupts_disabled());
         ASSERT(irq_spinlock_locked(&thread->lock));
-
+        
         stats_thread->thread_id = thread->tid;
         stats_thread->task_id = thread->task->taskid;

kernel/generic/src/sysinfo/sysinfo.c

@@ -99 +99 @@
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);
-
+        
         mutex_initialize(&sysinfo_lock, MUTEX_ACTIVE);
 }
@@ -635 +635 @@
         ASSERT(path);
         
-        if ((copy_from_uspace(path, ptr, size + 1) == 0)
-            && (path[size] == 0)) {
+        if ((copy_from_uspace(path, ptr, size + 1) == 0) &&
+            (path[size] == 0)) {
                 /*
                  * Prevent other functions from messing with sysinfo while we
@@ -645 +645 @@
                 mutex_unlock(&sysinfo_lock);
         }
+        
         free(path);
         return ret;
@@ -672 +673 @@
         
         /*
-         * Map generated value types to constant types (user space does not care
-         * whether the value is constant or generated).
+         * Map generated value types to constant types (user space does
+         * not care whether the value is constant or generated).
          */
         if (ret.tag == SYSINFO_VAL_FUNCTION_VAL)
@@ -701 +702 @@
 {
         int rc;
-
+        
         /*
          * Get the item.
          *
-         * N.B.: There is no need to free any potential generated binary data
-         * since we request a dry run.
+         * N.B.: There is no need to free any potential generated binary
+         * data since we request a dry run.
          */
         sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true);
@@ -741 +742 @@
          * Get the item.
          *
-         * N.B.: There is no need to free any potential generated binary data
-         * since we request a dry run.
+         * N.B.: There is no need to free any potential generated binary
+         * data since we request a dry run.
          */
         sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true);