Changeset 4339f09 in mainline for uspace/app/bdsh/cmds

Timestamp:

2013-06-28T07:46:31Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e52b4b5

Parents:

3de67b4c (diff), dba3e2c (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:

Mostly C style (obey clang suggestions)

Merge from lp:~vojtech-horky/helenos/misc.

Most changes driven by warnings/errors from clang, such as type
redefinitions (typedef struct …) or possibly uninitizalied
variables. Clang still emits some warnings but a lot less than
before . As a result, kernel can be built with clang/-Werror.

Also updated mkext2.py to work with Python 3 again.

Location:

uspace/app/bdsh/cmds/modules

Files:

• help/help.c (modified) (3 diffs)
• pwd/pwd.c (modified) (1 diff)
• rm/rm.c (modified) (2 diffs)

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

@@ -98 +98 @@
         builtin_t *cmd;
         module_t *mod;
-        unsigned int i;
 
         printf("\n  Bdsh built-in commands:\n");
@@ -104 +103 @@
 
         /* First, show a list of built in commands that are available in this mode */
-        for (cmd = builtins; cmd->name != NULL; cmd++, i++) {
+        for (cmd = builtins; cmd->name != NULL; cmd++) {
                         if (is_builtin_alias(cmd->name))
                                 printf("   %-16s\tAlias for `%s'\n", cmd->name,
@@ -112 +111 @@
         }
 
-        i = 0;
-
         /* Now, show a list of module commands that are available in this mode */
-        for (mod = modules; mod->name != NULL; mod++, i++) {
+        for (mod = modules; mod->name != NULL; mod++) {
                         if (is_module_alias(mod->name))
                                 printf("   %-16s\tAlias for `%s'\n", mod->name,

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

@@ -55 +55 @@
         }
 
-        memset(buff, 0, sizeof(buff));
+        memset(buff, 0, PATH_MAX);
         getcwd(buff, PATH_MAX);
 

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

@@ -99 +99 @@
         if (NULL == (rm->nwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->nwd, 0, sizeof(rm->nwd));
+        memset(rm->nwd, 0, PATH_MAX);
 
         if (NULL == (rm->owd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->owd, 0, sizeof(rm->owd));
+        memset(rm->owd, 0, PATH_MAX);
 
         if (NULL == (rm->cwd = (char *) malloc(PATH_MAX)))
                 return 0;
-        memset(rm->cwd, 0, sizeof(rm->cwd));
+        memset(rm->cwd, 0, PATH_MAX);
 
         chdir(".");
@@ -298 +298 @@
                         break;
                 }
-                memset(buff, 0, sizeof(buff));
+                memset(buff, 0, len);
                 snprintf(buff, len, "%s", argv[i]);