Clean up warnings

Eliminate compiler warnings due to various issues (listed below).  This
allows Zephyr to build cleanly under GCC versions ranging from 4.1.0 to
4.7.2 with all of the options shown below:

  -g -O2 -Wall -Werror
  -Wno-deprecated-declarations
  -Wmissing-declarations
  -Wpointer-arith
  -Wstrict-prototypes
  -Wshadow
  -Wextra
  -Wno-missing-field-initializers
  -Wno-unused-parameter

  and, on recent versions, -Wunreachable-code

Test builds were done
  - On Ubuntu 12.10 (Quantal Quetzal) using both MIT Kerberos 1.10.1 and
    Heimdal 1.6, without krb4 and both with and without C-Ares and Hesiod
  - On Fedora 14 using Heimdal 0.6, without C-Ares or Hesiod and both
    with and without krb4 (KTH Kerberos 1.3rc2)
  - On Fedora Core 3, Fedora Core 5, Fedora 7, and Fedora 10, using
    Heimdal 0.6 and without C-Ares, Hesiod, or krb4

It also allows clean builds  on Solaris 10 under the Sun Studio 12 (9/07)
C compiler with the following options:

  -g -fd -v -errfmt -errhdr=%user -errtags=yes -errwarn=%all
  -erroff=E_OLD_STYLE_FUNC_DECL,E_ENUM_TYPE_MISMATCH_ARG,E_ARG_INCOMPATIBLE_WITH_ARG

... and under Solaris 9 with the Sun Forte 7 (3/02) C compiler with the above
options and -erroff=E_FUNC_HAS_NO_RETURN_STMT.  Solaris builds were done
with Heimdal 0.6 and without C-Ares, Hesiod, or krb4.

The following types of issues are addressed in this change:

- Parameters and local variables with the same names as library functions
- Parameters and local variables with the same names as globals
- Declarations for exported global variables missing from headers
- Prototypes for exported functions missing from headers
- Missing 'static' on functions that shouldn't be exported
- Old-style function declarations
- Duplicate declarations
- Type mismatches
- Unused variables and functions
- Uninitialized variables
- Forward references to enums
- Necessary header files not included
- Violations of the aliasing rules, where GCC was able to detect them
- Missing braces on if blocks that might be empty
- Attempts to do pointer arithmetic on pointers of type void *, which
  is not permitted in standard C.
- An attempt to pass a function pointer via a void * parameter, which is
  not permitted in standard C.  Instead, we now pass a pointer to a
  structure, which then contains the required function pointer.
- Unnecessary inclusion of <krb5_err.h>, which is already included by
  <krb5.h> when the former exists, and might not be protected against
  double inclusion, depending on which com_err was used.
- Missing include of <com_err.h>, which was masked by the fact that it is
  included by headers generated by e2fsprogs compile_et
- Use of com_err() with a non-constant value in place of the format string,
  which in every case was a fixed-size buffer in which a message was built
  using sprintf(!).  Both the calls to sprintf and the fixed-size buffers
  have been removed, in favor of just letting com_err() do the formatting.
- Various cases where X library functions expecting a parameter of type
  wchar_t * were instead passed a parameter of type XChar2b *.  The two
  types look similar, but are not the same and are _not_ interchangeable.
- An overly-simplistic configure test which failed to detect existence of
  <term.h> on Solaris, due to not including <curses.h>.
- Using the wrong type for the flags output of krb5_auth_con_getflags()
  when building against Heimdal.  A configure test is added to detect
  the correct type.

2 files changed, 17 insertions, 4 deletions

diff --git a/h/internal.h b/h/internal.h
index 8ae74b0..5cf2128 100644
--- a/h/internal.h
+++ b/h/internal.h
@@ -105,6 +105,7 @@ typedef Code_t (*Z_SendProc) (ZNotice_t *, char *, int, int);
 
 struct _Z_InputQ *Z_GetFirstComplete (void);
 struct _Z_InputQ *Z_GetNextComplete (struct _Z_InputQ *);
+struct _Z_InputQ *Z_SearchQueue (ZUnique_Id_t *, ZNotice_Kind_t);
 Code_t Z_XmitFragment (ZNotice_t*, char *,int,int);
 void Z_RemQueue (struct _Z_InputQ *);
 Code_t Z_AddNoticeToEntry (struct _Z_InputQ*, ZNotice_t*, int);
@@ -114,6 +115,7 @@ Code_t Z_FormatRawHeader (ZNotice_t *, char*, int,
 			      int*, char **, char **);
 Code_t Z_ReadEnqueue (void);
 Code_t Z_ReadWait (void);
+int Z_PacketWaiting (void);
 Code_t Z_SendLocation (char*, char*, Z_AuthProc, char*);
 Code_t Z_SendFragmentedNotice (ZNotice_t *notice, int len,
 				   Z_AuthProc cert_func,
@@ -153,6 +155,9 @@ unsigned long z_quad_cksum(const unsigned char *, uint32_t *, long,
 			   int, unsigned char *);
 Code_t ZFormatAuthenticNoticeV5(ZNotice_t*, char*, int, int*, krb5_keyblock *);
 #endif
+#ifdef HAVE_KRB4
+Code_t ZFormatAuthenticNotice(ZNotice_t*, char*, int, int*, C_Block);
+#endif
 
 #ifdef HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE
 #define Z_keydata(keyblock)	((keyblock)->contents)
diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h
index 536175a..a7eb17f 100644
--- a/h/zephyr/zephyr.h
+++ b/h/zephyr/zephyr.h
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <com_err.h>
 
 #include <zephyr/zephyr_err.h>
 
@@ -154,6 +155,7 @@ typedef Code_t (*Z_AuthProc)(ZNotice_t*, char *, int, int *);
 Code_t ZMakeAuthentication(ZNotice_t*, char *,int, int*);
 Code_t ZMakeZcodeAuthentication(ZNotice_t*, char *,int, int*);
 Code_t ZMakeZcodeRealmAuthentication(ZNotice_t*, char *,int, int*, char*);
+Code_t ZResetAuthentication(void);
 
 char *ZGetSender(void);
 char *ZGetVariable(char *);
@@ -161,8 +163,6 @@ Code_t ZSetVariable(char *var, char *value);
 Code_t ZUnsetVariable(char *var);
 int ZGetWGPort(void);
 Code_t ZSetDestAddr(struct sockaddr_in *);
-Code_t ZFormatNoticeList(ZNotice_t*, char**, int,
-			 char **, int*, Z_AuthProc);
 Code_t ZParseNotice(char*, int, ZNotice_t *);
 Code_t ZReadAscii(char*, int, unsigned char*, int);
 Code_t ZReadAscii32(char *, int, unsigned long *);
@@ -172,14 +172,20 @@ Code_t ZSendPacket(char*, int, int);
 Code_t ZSendList(ZNotice_t*, char *[], int, Z_AuthProc);
 Code_t ZSrvSendList(ZNotice_t*, char*[], int, Z_AuthProc,
 		    Code_t (*)(ZNotice_t *, char *, int, int));
+Code_t ZSendRawList(ZNotice_t*, char *[], int);
 Code_t ZSendNotice(ZNotice_t *, Z_AuthProc);
+Code_t ZSendRawNotice(ZNotice_t *);
 Code_t ZSrvSendNotice(ZNotice_t*, Z_AuthProc,
 		      Code_t (*)(ZNotice_t *, char *, int, int));
 Code_t ZFormatNotice(ZNotice_t*, char**, int*, Z_AuthProc);
-Code_t ZFormatSmallNotice(ZNotice_t*, ZPacket_t, int*, Z_AuthProc);
+Code_t ZNewFormatNotice(ZNotice_t*, char**, int*, Z_AuthProc);
+Code_t ZFormatNoticeList(ZNotice_t*, char**, int,
+			 char **, int*, Z_AuthProc);
 Code_t ZFormatRawNoticeList(ZNotice_t *, char *[], int, char **, int *);
+Code_t ZFormatSmallNotice(ZNotice_t*, ZPacket_t, int*, Z_AuthProc);
 Code_t ZFormatSmallRawNotice(ZNotice_t *, ZPacket_t, int *);
 Code_t ZNewFormatSmallRawNotice(ZNotice_t *, ZPacket_t, int *);
+Code_t ZFormatSmallRawNoticeList(ZNotice_t *, char *[], int, ZPacket_t, int *);
 Code_t ZLocateUser(char *, int *, Z_AuthProc);
 Code_t ZRequestLocations(char *, ZAsyncLocateData_t *,
 			 ZNotice_Kind_t, Z_AuthProc);
@@ -187,7 +193,6 @@ Code_t ZhmStat(struct in_addr *, ZNotice_t *);
 Code_t ZInitialize(void);
 Code_t ZSetServerState(int);
 Code_t ZSetFD(int);
-Code_t ZFormatSmallRawNotice(ZNotice_t*, ZPacket_t, int*);
 int ZCompareUID(ZUnique_Id_t*, ZUnique_Id_t*);
 Code_t ZSrvSendRawList(ZNotice_t*, char*[], int,
 		       Code_t (*)(ZNotice_t *, char *, int, int));
@@ -228,6 +233,9 @@ Code_t ZPeekPacket(char **buffer, int *ret_len,
 Code_t ZPeekNotice(ZNotice_t *notice, struct sockaddr_in *from);
 Code_t ZIfNotice(ZNotice_t *notice, struct sockaddr_in *from,
 		 int (*predicate)(ZNotice_t *, void *), void *args);
+Code_t ZPeekIfNotice(ZNotice_t *notice, struct sockaddr_in *from,
+		 int (*predicate)(ZNotice_t *, char *), char *args);
+Code_t ZPunt(ZSubscription_t *sublist, int nitems, unsigned int port);
 Code_t ZSubscribeTo(ZSubscription_t *sublist, int nitems,
 		    unsigned int port);
 Code_t ZSubscribeToSansDefaults(ZSubscription_t *sublist, int nitems,