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.

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

diff --git a/src/kadmin/server/network.c b/src/kadmin/server/network.c
index 5dd7f2e02eb303ee734966a8b5bedf744211f4a7..0b8880e493a9e888d389cdde8d30895ea4e0a84d 100644 (file)
--- a/src/kadmin/server/network.c
+++ b/src/kadmin/server/network.c
@@ -260,14 +260,19 @@ static SET(struct connection *) connections;
 #define conns           connections.data
 
 /* Set<u_short> udp_port_data, tcp_port_data; */
-static SET(u_short) udp_port_data, tcp_port_data;
-
-                    struct rpc_svc_data {
-                        u_short port;
-                        u_long prognum;
-                        u_long versnum;
-                        void (*dispatch)();
-                    };
+/*
+ * 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)();
+};
 
 static SET(struct rpc_svc_data) rpc_svc_data;
 

diff --git a/src/kdc/network.c b/src/kdc/network.c
index ec0262231cec56a8247765e4ad66d3154a3bb608..a96bc3028a79af8392381433ef9374a9b4f1719f 100644 (file)
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -250,13 +250,18 @@ static SET(struct connection *) connections;
 #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;