diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 253412624e0fa60a309c6691b0cd99b6c341df87 (patch) | |
| tree | d261ea96f8b29388beb93ec1b05b7b972aa548c1 /common | |
| parent | 6191ef93b25edbd75caec9213db3665f486ee433 (diff) | |
| parent | c35624d1946a4756c93bdb489f4790176b6e2dcc (diff) | |
| download | barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.gz barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common')
| -rw-r--r-- | common/block.c | 2 | ||||
| -rw-r--r-- | common/command.c | 2 | ||||
| -rw-r--r-- | common/hush.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/common/block.c b/common/block.c index 0edc8619ef..e2ba9d4296 100644 --- a/common/block.c +++ b/common/block.c @@ -374,6 +374,8 @@ int blockdevice_register(struct block_device *blk) list_add_tail(&blk->list, &block_device_list); + cdev_create_default_automount(&blk->cdev); + return 0; } diff --git a/common/command.c b/common/command.c index 03c70834d1..d9cc4a6d48 100644 --- a/common/command.c +++ b/common/command.c @@ -104,7 +104,7 @@ int register_command(struct command *cmd) list_add_sort(&cmd->list, &command_list, compare); if (cmd->aliases) { - char **aliases = (char**)cmd->aliases; + const char * const *aliases = cmd->aliases; while(*aliases) { struct command *c = xzalloc(sizeof(struct command)); diff --git a/common/hush.c b/common/hush.c index d3f7bf330d..792b61ac9a 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1974,7 +1974,7 @@ static int do_source(int argc, char *argv[]) return ret; } -static const char *source_aliases[] = { ".", NULL}; +static const char * const source_aliases[] = { ".", NULL}; BAREBOX_CMD_HELP_START(source) BAREBOX_CMD_HELP_TEXT("Read and execute commands from FILE in the current shell environment.") |