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>

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>
Tilman Schmidt · David S. Miller
1 parent 2bf3a09ea5
Showing 1 changed file with 7 additions and 2 deletions Side-by-side Diff
drivers/isdn/capi/capiutil.c
@@ -489,12 +489,17 @@
  * @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;
 }
...	...	@@ -489,12 +489,17 @@
489	489	* @cmd: command number
490	490	* @subcmd: subcommand number
491	491	*
492		- * Return value: static string, NULL if command/subcommand unknown
	492	+ * Return value: static string
493	493	*/
494	494
495	495	char *capi_cmd2str(u8 cmd, u8 subcmd)
496	496	{
497		- return mnames[command_2_index(cmd, subcmd)];
	497	+ char *result;
	498	+
	499	+ result = mnames[command_2_index(cmd, subcmd)];
	500	+ if (result == NULL)
	501	+ result = "INVALID_COMMAND";
	502	+ return result;
498	503	}
499	504
500	505