diff options
| author | Tilman Schmidt <tilman@imap.cc> | 2014-10-11 13:46:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-14 15:05:35 -0400 |
| commit | 340184b35ac8786bdb574d2c8ce8e4f1269ec4da (patch) | |
| tree | 476198dccf63ead3c26d49ce496c429e24d4a0bf | |
| parent | 2bf3a09ea51f807d78d48d0ebc591b9e1502a743 (diff) | |
| download | linux-340184b35ac8786bdb574d2c8ce8e4f1269ec4da.tar.gz linux-340184b35ac8786bdb574d2c8ce8e4f1269ec4da.tar.bz2 linux-340184b35ac8786bdb574d2c8ce8e4f1269ec4da.zip | |
isdn/capi: don't return NULL from capi_cmd2str()
capi_cmd2str() is used in many places to build log messages.
None of them is prepared to handle NULL as a result.
Change the function to return printable string "INVALID_COMMAND"
instead.
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/isdn/capi/capiutil.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index 36835ef3f340..36c1b37cea0a 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c @@ -489,12 +489,17 @@ static char *mnames[] = * @cmd: command number * @subcmd: subcommand number * - * Return value: static string, NULL if command/subcommand unknown + * Return value: static string */ char *capi_cmd2str(u8 cmd, u8 subcmd) { - return mnames[command_2_index(cmd, subcmd)]; + char *result; + + result = mnames[command_2_index(cmd, subcmd)]; + if (result == NULL) + result = "INVALID_COMMAND"; + return result; } |