Fix warnings in comerr directory

Prototype yylex in error_table.y to remove warning
Fix the bizarre definition of LOCK_ET_LIST so that it upsets neither the
compiler, nor the reader.

Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/169
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Russ Allbery <rra@stanford.edu>
Reviewed-by: Russ Allbery <rra@stanford.edu>

diff --git a/src/comerr/error_msg.c b/src/comerr/error_msg.c
index b00284b6007199ceb0059b5ec81880be8578e2ba..afa0c971fc280428293a776a7e3133c77c184bbe 100644 (file)
--- a/src/comerr/error_msg.c
+++ b/src/comerr/error_msg.c
@@ -54,7 +54,8 @@ et_mutex_once(void)
 
 #define LOCK_ET_LIST \
        do { \
-           (et_list_done || pthread_once(&et_list_once, et_mutex_once)); \
+           if (!et_list_done) \
+               pthread_once(&et_list_once, et_mutex_once); \
            assert(pthread_mutex_lock(&et_list_mutex)==0); \
        } while (0)
 #define UNLOCK_ET_LIST assert(pthread_mutex_unlock(&et_list_mutex)==0)

diff --git a/src/comerr/error_table.y b/src/comerr/error_table.y
index 97dc91ae04d25ca12d5cdcd93d7b531c6b4a27f8..d68bd7018c938a1cf19fcf3be4852d509e783cfd 100644 (file)
--- a/src/comerr/error_table.y
+++ b/src/comerr/error_table.y
@@ -59,6 +59,8 @@ void put_ecs(void);
 void set_table_num(char *string);
 void set_table_fun(char *astring);
 
+extern int yylex (void);
+
 %}
 %union {
        char *dynstr;