소스 검색

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 10 년 전
부모
커밋
340184b35a
1개의 변경된 파일7개의 추가작업 그리고 2개의 파일을 삭제
  1. 7 2
      drivers/isdn/capi/capiutil.c

+ 7 - 2
drivers/isdn/capi/capiutil.c

@@ -489,12 +489,17 @@ static char *mnames[] =
  * @cmd:	command number
  * @cmd:	command number
  * @subcmd:	subcommand number
  * @subcmd:	subcommand number
  *
  *
- * Return value: static string, NULL if command/subcommand unknown
+ * Return value: static string
  */
  */
 
 
 char *capi_cmd2str(u8 cmd, u8 subcmd)
 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;
 }
 }