svn rev #23129: trunk/src/ kadmin/server/ kdc/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23129
Commit By: raeburn
Log Message:
Use "unsigned short" instead of "u_short" in argument to SET macro;
the Emacs cc-mode indentation code seems to get confused by the
one-word case.

Reindent.


Changed Files:
U   trunk/src/kadmin/server/network.c
U   trunk/src/kdc/network.c
Modified: trunk/src/kadmin/server/network.c
===================================================================
--- trunk/src/kadmin/server/network.c	2009-11-04 16:31:41 UTC (rev 23128)
+++ trunk/src/kadmin/server/network.c	2009-11-04 18:11:51 UTC (rev 23129)
@@ -260,14 +260,19 @@
 #define conns           connections.data
 
 /* Set<u_short> udp_port_data, tcp_port_data; */
-static SET(u_short) udp_port_data, tcp_port_data;
+/*
+ * N.B.: The Emacs cc-mode indentation code seems to get confused if
+ * the macro argument here is one word only.  So use "unsigned short"
+ * instead of the "u_short" we were using before.
+ */
+static SET(unsigned short) udp_port_data, tcp_port_data;
 
-                    struct rpc_svc_data {
-                        u_short port;
-                        u_long prognum;
-                        u_long versnum;
-                        void (*dispatch)();
-                    };
+struct rpc_svc_data {
+    u_short port;
+    u_long prognum;
+    u_long versnum;
+    void (*dispatch)();
+};
 
 static SET(struct rpc_svc_data) rpc_svc_data;
 

Modified: trunk/src/kdc/network.c
===================================================================
--- trunk/src/kdc/network.c	2009-11-04 16:31:41 UTC (rev 23128)
+++ trunk/src/kdc/network.c	2009-11-04 18:11:51 UTC (rev 23129)
@@ -250,13 +250,18 @@
 #define conns           connections.data
 
 /* Set<u_short> udp_port_data, tcp_port_data; */
-static SET(u_short) udp_port_data, tcp_port_data;
+/*
+ * N.B.: The Emacs cc-mode indentation code seems to get confused if
+ * the macro argument here is one word only.  So use "unsigned short"
+ * instead of the "u_short" we were using before.
+ */
+static SET(unsigned short) udp_port_data, tcp_port_data;
 
 #include "cm.h"
 
-                    static struct select_state sstate;
+static struct select_state sstate;
 
-                    static krb5_error_code add_udp_port(int port)
+static krb5_error_code add_udp_port(int port)
 {
     int i;
     void *tmp;