Changeset 7c3fb9b in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2018-05-17T08:29:01Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ff23ff

Parents:

fac0ac7

git-author:

Jiri Svoboda <jiri@…> (2018-05-16 17:28:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-17 08:29:01)

Message:

Fix block comment formatting (ccheck).

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (1 diff)
• cp/cp.c (modified) (5 diffs)
• ls/ls.c (modified) (1 diff)
• module_aliases.h (modified) (1 diff)
• modules.h (modified) (3 diffs)
• rm/rm.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -274 +274 @@
                                                 break;
                                         } else if (c == U_SPECIAL && offset + 2 >= (size_t)bytes) {
-                                                /* If an extended character is cut off due to the size of the buffer,
-                                                   we will copy it over to the next buffer so it can be read correctly. */
+                                                /*
+                                                 * If an extended character is cut off due to the size of the buffer,
+                                                 * we will copy it over to the next buffer so it can be read correctly.
+                                                 */
                                                 copied_bytes = bytes - offset + 1;
                                                 memcpy(buff, buff + offset - 1, copied_bytes);

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -207 +207 @@
                         /* e.g. cp file_name /data/ */
 
-                        /* dest is a directory,
+                        /*
+                         * dest is a directory,
                          * append the src filename to it.
                          */
@@ -231 +232 @@
                         /* e.g. cp file_name existing_file */
 
-                        /* dest already exists,
+                        /*
+                         * dest already exists,
                          * if force is set we will try to remove it.
                          * if interactive is set user input is required.
@@ -298 +300 @@
                         if (str_cmp(src_dirname, "..") &&
                             str_cmp(src_dirname, ".")) {
-                                /* The last component of src_path is
+                                /*
+                                 * The last component of src_path is
                                  * not '.' or '..'
                                  */
@@ -314 +317 @@
                 default:
                 case TYPE_NONE:
-                        /* dest does not exists, this means the user wants
+                        /*
+                         * dest does not exists, this means the user wants
                          * to specify the name of the destination directory
                          *
@@ -336 +340 @@
                 }
 
-                /* Copy every single directory entry of src into the
+                /*
+                 * Copy every single directory entry of src into the
                  * destination directory.
                  */

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -27 +27 @@
  */
 
-/* NOTE:
+/*
+ * NOTE:
  * This is a bit of an ugly hack, working around the absence of fstat / etc.
- * As more stuff is completed and exposed in libc, this will improve */
+ * As more stuff is completed and exposed in libc, this will improve
+ */
 
 #include <errno.h>

uspace/app/bdsh/cmds/modules/module_aliases.h

@@ -30 +30 @@
 #define MODULE_ALIASES_H
 
-/* Modules that declare multiple names for themselves but use the
+/*
+ * Modules that declare multiple names for themselves but use the
  * same entry functions are aliases. This array helps to determine if
  * a module is an alias, as such it can be invoked differently.
- * format is alias , real_name */
+ * format is alias , real_name
+ */
 
-/* So far, this is only used in the help display but could be used to
+/*
+ * So far, this is only used in the help display but could be used to
  * handle a module differently even prior to reaching its entry code.
  * For instance, 'exit' could behave differently than 'quit', prior to
- * the entry point being reached. */
+ * the entry point being reached.
+ */
 
 const char *mod_aliases[] = {

uspace/app/bdsh/cmds/modules/modules.h

@@ -30 +30 @@
 #define MODULES_H
 
-/* Each built in function has two files, one being an entry.h file which
+/*
+ * Each built in function has two files, one being an entry.h file which
  * prototypes the run/help entry functions, the other being a .def file
  * which fills the modules[] array according to the cmd_t structure
@@ -40 +41 @@
  *
  * NOTE: See module_ aliases.h as well, this is where aliases (commands that
- * share an entry point with others) are indexed */
+ * share an entry point with others) are indexed
+ */
 
 #include "config.h"
@@ -64 +66 @@
 #include "cmp/entry.h"
 
-/* Each .def function fills the module_t struct with the individual name, entry
+/*
+ * Each .def function fills the module_t struct with the individual name, entry
  * point, help entry point, etc. You can use config.h to control what modules
- * are loaded based on what libraries exist on the system. */
+ * are loaded based on what libraries exist on the system.
+ */
 
 module_t modules[] = {

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -95 +95 @@
         rm->safe = 0;
 
-        /* Make sure we can allocate enough memory to store
-         * what is needed in the job structure */
+        /*
+         * Make sure we can allocate enough memory to store
+         * what is needed in the job structure
+         */
         if (NULL == (rm->nwd = (char *) malloc(PATH_MAX)))
                 return 0;