From 6496a763bac88e40b0b79277e6f47bb0c285854e Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 4 Nov 2009 18:11:51 +0000 Subject: [PATCH] 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 --- src/kadmin/server/network.c | 21 +++++++++++++-------- src/kdc/network.c | 11 ++++++++--- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/kadmin/server/network.c b/src/kadmin/server/network.c index 5dd7f2e02..0b8880e49 100644 --- 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 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 ec0262231..a96bc3028 100644 --- a/src/kdc/network.c +++ b/src/kdc/network.c @@ -250,13 +250,18 @@ static SET(struct connection *) connections; #define conns connections.data /* Set 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; -- 2.26.2