Rearrange #include files so that krb5.h gets included first, so that

the debugging information can be more efficiently collapsed since the
type numbers will be the same.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5853 dc483132-0cff-0310-8789-dd5450dbe970

20 files changed, 63 insertions, 18 deletions

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index c19deaad2..241fbea82 100644
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,13 @@
+Tue May 23 16:22:57 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* asn1_decode.c: Rearrange #include files so that krb5.h gets
+		included first, so that the debugging information can be
+		more efficiently collapsed since the type numbers will be
+		the same.
+
+	* asn1_encode.h: Rearrange the #include files so that the type
+		numbers are the same.
+
 Thu Apr 13 20:13:38 1995 Keith Vetter (keithv@fusion.com)
 
 	* asn1_k_decode.c: fixed up 'unreferenced local variable' problems.
diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c
index 54a14df37..cb48c2e5b 100644
--- a/src/lib/krb5/asn.1/asn1_decode.c
+++ b/src/lib/krb5/asn.1/asn1_decode.c
@@ -21,10 +21,10 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
 /* ASN.1 primitive decoders */
 #include "asn1_decode.h"
 #include "asn1_get.h"
+#include <stdio.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME
diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h
index c8995b549..baae56271 100644
--- a/src/lib/krb5/asn.1/asn1_encode.h
+++ b/src/lib/krb5/asn.1/asn1_encode.h
@@ -25,9 +25,9 @@
 #define __ASN1_ENCODE_H__
 
 #include "k5-int.h"
-#include <time.h>
 #include "krbasn1.h"
 #include "asn1buf.h"
+#include <time.h>
 
 /*
    Overview
diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog
index 067ec852f..894b4015f 100644
--- a/src/lib/krb5/ccache/file/ChangeLog
+++ b/src/lib/krb5/ccache/file/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 23 16:28:07 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* fcc_maybe.c: Rearrange #include files so that krb5.h gets
+		included first, so that the debugging information can be
+		more efficiently collapsed since the type numbers will be
+		the same.
+
 Tue May  9 16:23:39 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* fcc_close.c (krb5_fcc_close): Remove <malloc.h> as not all
diff --git a/src/lib/krb5/ccache/file/fcc_maybe.c b/src/lib/krb5/ccache/file/fcc_maybe.c
index 6378d6801..6f4cfd093 100644
--- a/src/lib/krb5/ccache/file/fcc_maybe.c
+++ b/src/lib/krb5/ccache/file/fcc_maybe.c
@@ -24,14 +24,14 @@
  * This file contains the source code for conditional open/close calls.
  */
 
+#include "k5-int.h"
+
 #define NEED_SOCKETS    /* Only for ntohs, etc. */
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
           
 #include "fcc.h"
-#include <errno.h>
-#include "k5-int.h"
 
 int krb5_fcc_default_format = KRB5_FCC_DEFAULT_FVNO;
 
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 2ff9d0212..d7ceab323 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 23 16:28:42 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* gc_frm_kdc.c, preauth.c, t_kerb.c, t_walk_rtree.c, unparse.c:
+		Rearrange #include files so that krb5.h gets included
+		first, so that the debugging information can be more
+		efficiently collapsed since the type numbers will be the
+		same.
+
 Sat May 20 14:01:16 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* rd_safe.c (krb5_rd_safe): Increment remote_seq_number if
diff --git a/src/lib/krb5/krb/chk_trans.c b/src/lib/krb5/krb/chk_trans.c
index 75794e815..c3246675b 100644
--- a/src/lib/krb5/krb/chk_trans.c
+++ b/src/lib/krb5/krb/chk_trans.c
@@ -20,8 +20,8 @@
  * or implied warranty.
  */
 
-#include <stdio.h>
 #include "k5-int.h"
+#include <stdio.h>
 
 #define MAX_REALM_LN 500
 
diff --git a/src/lib/krb5/krb/gc_frm_kdc.c b/src/lib/krb5/krb/gc_frm_kdc.c
index a2a7f5774..f2a3267c6 100644
--- a/src/lib/krb5/krb/gc_frm_kdc.c
+++ b/src/lib/krb5/krb/gc_frm_kdc.c
@@ -27,8 +27,8 @@
  * along the way.
  */
 
-#include <stdio.h>
 #include "k5-int.h"
+#include <stdio.h>
 #include "int-proto.h"
 
 /*
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 00c17a9a2..24269e041 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -37,9 +37,9 @@
  * into different files.... [tytso:19920903.1618EDT]
  */
 
+#include "k5-int.h"
 #include <stdio.h>
 #include <time.h>
-#include "k5-int.h"
 #include <syslog.h>
 #ifdef _MSDOS
 #define getpid _getpid
diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c
index f2dcf8a9a..ef0537ec2 100644
--- a/src/lib/krb5/krb/t_kerb.c
+++ b/src/lib/krb5/krb/t_kerb.c
@@ -3,6 +3,7 @@
  * routines.
  */
 
+#include "krb5.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -12,7 +13,6 @@
 #include <arpa/inet.h>
 
 #include "com_err.h"
-#include "krb5.h"
 
 
 void test_425_conv_principal(ctx, name, inst, realm)
diff --git a/src/lib/krb5/krb/t_walk_rtree.c b/src/lib/krb5/krb/t_walk_rtree.c
index c61ec4ef3..ca8f4427b 100644
--- a/src/lib/krb5/krb/t_walk_rtree.c
+++ b/src/lib/krb5/krb/t_walk_rtree.c
@@ -2,8 +2,8 @@
  * t_walk_rtree.c --- test krb5_walk_realm_tree
  */
 
-#include <stdio.h>
 #include "k5-int.h"
+#include <stdio.h>
 #include "com_err.h"
 
 main(argc, argv)
diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c
index d047a8bb6..0ff3cf8ad 100644
--- a/src/lib/krb5/krb/unparse.c
+++ b/src/lib/krb5/krb/unparse.c
@@ -29,8 +29,8 @@
  */
 
 
-#include <stdio.h>
 #include "k5-int.h"
+#include <stdio.h>
 
 /*
  * converts the multi-part principal format used in the protocols to a
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index bbb38acd8..298da86c5 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 23 16:29:24 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* t_std_conf.c, timeofday.c, unlck_file.c: Rearrange #include
+		files so that krb5.h gets included first, so that the
+		debugging information can be more efficiently collapsed
+		since the type numbers will be the same.
+
 Tue May 16 10:33:03 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* gmt_mktime.c	- Use the actual year instead of the number of years
 			  since 1900 when determining if a year has a leapday.
diff --git a/src/lib/krb5/os/t_std_conf.c b/src/lib/krb5/os/t_std_conf.c
index 0e8a9241c..4b1e0b0fd 100644
--- a/src/lib/krb5/os/t_std_conf.c
+++ b/src/lib/krb5/os/t_std_conf.c
@@ -3,6 +3,8 @@
  * 	values from the krb5 config file(s).
  */
 
+#include "krb5.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -11,8 +13,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "krb5.h"
-
 void test_get_default_realm(ctx)
 	krb5_context ctx;
 {
diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c
index 82636efa6..3aaf81485 100644
--- a/src/lib/krb5/os/timeofday.c
+++ b/src/lib/krb5/os/timeofday.c
@@ -25,11 +25,10 @@
  */
 
 
-#include <time.h>
-#include <stdio.h>			/* needed for libos-proto.h */
-
 #include "k5-int.h"
 
+#include <time.h>
+
 #ifdef POSIX_TYPES
 #define timetype time_t
 #else
diff --git a/src/lib/krb5/os/unlck_file.c b/src/lib/krb5/os/unlck_file.c
index 900073e09..44f90e6af 100644
--- a/src/lib/krb5/os/unlck_file.c
+++ b/src/lib/krb5/os/unlck_file.c
@@ -24,8 +24,8 @@
  * libos: krb5_lock_file routine
  */
 
-#include <stdio.h>
 #include "k5-int.h"
+#include <stdio.h>
 
 krb5_error_code
 krb5_unlock_file(context, filep, pathname)
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index 469161b8d..1a7d318e4 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 23 16:30:03 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* daemon.c: Rearrange #include files so that krb5.h gets included
+		first, so that the debugging information can be more
+		efficiently collapsed since the type numbers will be the
+		same.
+
 Fri Apr 28 08:37:58 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
 
 	* daemon.c (daemon): Lint cleanup; explicitly declare that
diff --git a/src/lib/krb5/posix/daemon.c b/src/lib/krb5/posix/daemon.c
index afe4c04b3..fb7a62a44 100644
--- a/src/lib/krb5/posix/daemon.c
+++ b/src/lib/krb5/posix/daemon.c
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#include "k5-int.h"
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/file.h>
@@ -38,7 +39,6 @@
 #ifdef HAS_PATHS_H
 #include <paths.h>
 #endif
-#include "k5-int.h"
 
 #ifndef _PATH_DEVNULL
 #define _PATH_DEVNULL "/dev/null"
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 30e6ffa1e..585ca17f6 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 23 16:30:29 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* rc_io.c: Rearrange #include files so that krb5.h gets included
+		first, so that the debugging information can be more
+		efficiently collapsed since the type numbers will be the
+		same.
+
 Mon May  1 23:10:26 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* rc_dfl.c (krb5_rc_dfl_recover): Fix memory leaks in this
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 3bbd6004c..92540caaf 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -16,8 +16,8 @@
 #define NEED_SOCKETS
 #define NEED_LOWLEVEL_IO         
 
-#include <stdio.h> /* for P_tmpdir */
 #include <krb5.h>
+#include <stdio.h> /* for P_tmpdir */
 #include "rc_base.h"
 #include "rc_dfl.h"
 #include "rc_io.h"