Changeset ab936440 in mainline for uspace/app/bdsh/cmds/modules/alias/alias.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

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

Ccheck correction and removing header which includes itself

File:

• uspace/app/bdsh/cmds/modules/alias/alias.c (modified) (4 diffs)

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

@@ -60 +60 @@
                 return true;
         }
-        
+
         cli_error(CL_ENOENT, "%s: No alias with the name '%s' exists\n", cmdname, name);
         return false;
@@ -123 +123 @@
 int cmd_alias(char **argv)
 {
-        
+
         if (argv[1] == NULL) {
                 list_aliases();
@@ -140 +140 @@
                                 return CMD_FAILURE;
                         }
-                        
+
                         set_alias(name, value + 1);
                 } else {
@@ -151 +151 @@
                 free(name);
         }
-        
+
         return CMD_SUCCESS;
 }