2 files changed, 10 insertions, 7 deletions

diff --git a/usr.bin/mk_cmds/cmd_tbl.l b/usr.bin/mk_cmds/cmd_tbl.l
index 15b31c6792c2..0c615cea5a61 100644
--- a/usr.bin/mk_cmds/cmd_tbl.l
+++ b/usr.bin/mk_cmds/cmd_tbl.l
@@ -11,41 +11,41 @@
 
 extern char *last_token, *ds();
 
-static l_command_table()
+static int l_command_table()
 {
      last_token = "command_table";
      return COMMAND_TABLE;
 }
 
-static l_request()
+static int l_request()
 {
      last_token = "request";
      return REQUEST;
 }
 
-static l_unimplemented()
+static int l_unimplemented()
 {
      last_token = "unimplemented";
      return UNIMPLEMENTED;
 }
 
-static l_end()
+static int l_end()
 {
      last_token = "end";
      return END;
 }
 
-static l_quoted_string()
+static int l_quoted_string()
 {
      register char *p;
      yylval.dynstr = ds(yytext+1);
-     if (p=rindex(yylval.dynstr, '"'))
+     if ( (p=rindex(yylval.dynstr, '"')) )
 	  *p='\0';
      last_token = ds(yylval.dynstr);
      return STRING;
 }
 
-static l_string()
+static int l_string()
 {
      yylval.dynstr = ds(yytext);
      last_token = ds(yylval.dynstr);
diff --git a/usr.bin/mk_cmds/mk_cmds.c b/usr.bin/mk_cmds/mk_cmds.c
index 829885971bd7..1c3a3fb6c53f 100644
--- a/usr.bin/mk_cmds/mk_cmds.c
+++ b/usr.bin/mk_cmds/mk_cmds.c
@@ -26,6 +26,7 @@ extern FILE *output_file;
 extern FILE *yyin, *yyout;
 extern int yylineno;
 
+int
 main(argc, argv)
     int argc;
     char **argv;
@@ -85,10 +86,12 @@ main(argc, argv)
     return result;
 }
 
+int
 yyerror(s)
     char *s;
 {
     fputs(s, stderr);
     fprintf(stderr, "\nLine %d; last token was '%s'\n",
 	    yylineno, last_token);
+    return 0;
 }