Make the indentation consistent.

Pull function names to column 0 - except when necessary for autoregistration.
Put function comments before the function.
For readability, put the macros for functions before the function too.
Put class functions before the class.

svn path=/trunk/; revision=34599

1 files changed, 161 insertions, 60 deletions

diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index d5a5d6389f..5822fda806 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -49,7 +49,9 @@ CLEAR_OUTSTANDING(Pinfo,expired, TRUE)
 CLEAR_OUTSTANDING(Column,expired, TRUE)
 CLEAR_OUTSTANDING(Columns,expired, TRUE)
 
-Pinfo* push_Pinfo(lua_State* L, packet_info* ws_pinfo) {
+Pinfo*
+push_Pinfo(lua_State* L, packet_info* ws_pinfo)
+{
     Pinfo pinfo = NULL;
     if (ws_pinfo) {
         pinfo = g_malloc(sizeof(struct _wslua_pinfo));
@@ -57,6 +59,7 @@ Pinfo* push_Pinfo(lua_State* L, packet_info* ws_pinfo) {
         pinfo->expired = FALSE;
         g_ptr_array_add(outstanding_Pinfo,pinfo);
     }
+
     return pushPinfo(L,pinfo);
 }
 
@@ -65,10 +68,12 @@ Pinfo* push_Pinfo(lua_State* L, packet_info* ws_pinfo) {
 
 WSLUA_CLASS_DEFINE(Address,NOP,NOP); /* Represents an address */
 
-WSLUA_CONSTRUCTOR Address_ip(lua_State* L) {
-	/* Creates an Address Object representing an IP address. */
-
+/* Creates an Address Object representing an IP address. */
 #define WSLUA_ARG_Address_ip_HOSTNAME 1 /* The address or name of the IP host. */
+WSLUA_CONSTRUCTOR
+Address_ip(lua_State* L)
+{
+
     Address addr = g_malloc(sizeof(address));
     guint32* ip_addr = g_malloc(sizeof(guint32));
     const gchar* name = luaL_checkstring(L,WSLUA_ARG_Address_ip_HOSTNAME);
@@ -84,7 +89,9 @@ WSLUA_CONSTRUCTOR Address_ip(lua_State* L) {
 
 #if 0
 /* TODO */
-static int Address_ipv6(lua_State* L) {
+static int
+Address_ipv6(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -92,7 +99,9 @@ static int Address_ipv6(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_ss7(lua_State* L) {
+static int
+Address_ss7(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -100,7 +109,9 @@ static int Address_ss7(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_eth(lua_State* L) {
+static int
+Address_eth(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -108,7 +119,9 @@ static int Address_eth(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_sna(lua_State* L) {
+static int
+Address_sna(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -116,7 +129,9 @@ static int Address_sna(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_atalk(lua_State* L) {
+static int
+Address_atalk(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -124,7 +139,9 @@ static int Address_atalk(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_vines(lua_State* L) {
+static int
+Address_vines(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -132,7 +149,9 @@ static int Address_vines(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_osi(lua_State* L) {
+static int
+Address_osi(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -140,7 +159,9 @@ static int Address_osi(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_arcnet(lua_State* L) {
+static int
+Address_arcnet(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -148,7 +169,9 @@ static int Address_arcnet(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_fc(lua_State* L) {
+static int
+Address_fc(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -156,7 +179,9 @@ static int Address_fc(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_string(lua_State* L) {
+static int
+Address_string(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -164,7 +189,9 @@ static int Address_string(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_eui64(lua_State* L) {
+static int
+Address_eui64(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -172,7 +199,9 @@ static int Address_eui64(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_uri(lua_State* L) {
+static int
+Address_uri(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -180,7 +209,9 @@ static int Address_uri(lua_State* L) {
     pushAddress(L,addr);
     return 1;
 }
-static int Address_tipc(lua_State* L) {
+static int
+Address_tipc(lua_State* L)
+{
     Address addr = g_malloc(sizeof(address));
 
     SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4));
@@ -211,7 +242,9 @@ WSLUA_METHODS Address_methods[] = {
     {0,0}
 };
 
-WSLUA_METAMETHOD Address__tostring(lua_State* L) {
+WSLUA_METAMETHOD
+Address__tostring(lua_State* L)
+{
     Address addr = checkAddress(L,1);
 
     lua_pushstring(L,get_addr_name(addr));
@@ -219,7 +252,9 @@ WSLUA_METAMETHOD Address__tostring(lua_State* L) {
     WSLUA_RETURN(1); /* The string representing the address. */
 }
 
-static int Address__gc(lua_State* L) {
+static int
+Address__gc(lua_State* L)
+{
     Address addr = checkAddress(L,1);
 
     if (addr) {
@@ -230,7 +265,10 @@ static int Address__gc(lua_State* L) {
     return 0;
 }
 
-WSLUA_METAMETHOD Address__eq(lua_State* L) { /* Compares two Addresses */
+/* Compares two Addresses */
+WSLUA_METAMETHOD
+Address__eq(lua_State* L)
+{
     Address addr1 = checkAddress(L,1);
     Address addr2 = checkAddress(L,2);
     gboolean result = FALSE;
@@ -243,7 +281,10 @@ WSLUA_METAMETHOD Address__eq(lua_State* L) { /* Compares two Addresses */
     return 1;
 }
 
-WSLUA_METAMETHOD Address__le(lua_State* L) { /* Compares two Addresses */
+/* Compares two Addresses */
+WSLUA_METAMETHOD
+Address__le(lua_State* L)
+{
     Address addr1 = checkAddress(L,1);
     Address addr2 = checkAddress(L,2);
     gboolean result = FALSE;
@@ -256,7 +297,10 @@ WSLUA_METAMETHOD Address__le(lua_State* L) { /* Compares two Addresses */
     return 1;
 }
 
-WSLUA_METAMETHOD Address__lt(lua_State* L) { /* Compares two Addresses */
+/* Compares two Addresses */
+WSLUA_METAMETHOD
+Address__lt(lua_State* L)
+{
     Address addr1 = checkAddress(L,1);
     Address addr2 = checkAddress(L,2);
     gboolean result = FALSE;
@@ -336,7 +380,9 @@ static const struct col_names_t colnames[] = {
     {NULL,0}
 };
 
-static gint col_name_to_id(const gchar* name) {
+static gint
+col_name_to_id(const gchar* name)
+{
     const struct col_names_t* cn;
     for(cn = colnames; cn->name; cn++) {
         if (g_str_equal(cn->name,name)) {
@@ -347,7 +393,9 @@ static gint col_name_to_id(const gchar* name) {
     return 0;
 }
 
-static const gchar*  col_id_to_name(gint id) {
+static const gchar*
+col_id_to_name(gint id)
+{
     const struct col_names_t* cn;
     for(cn = colnames; cn->name; cn++) {
         if ( cn->id == id ) {
@@ -358,7 +406,9 @@ static const gchar*  col_id_to_name(gint id) {
 }
 
 
-WSLUA_METAMETHOD Column__tostring(lua_State *L) {
+WSLUA_METAMETHOD
+Column__tostring(lua_State *L)
+{
     Column c = checkColumn(L,1);
     const gchar* name;
 
@@ -373,7 +423,9 @@ WSLUA_METAMETHOD Column__tostring(lua_State *L) {
     WSLUA_RETURN(1); /* A string representing the column */
 }
 
-static int Column__gc(lua_State* L) {
+static int
+Column__gc(lua_State* L)
+{
     Column col = checkColumn(L,1);
 
     if (!col) return 0;
@@ -387,8 +439,10 @@ static int Column__gc(lua_State* L) {
 
 }
 
-WSLUA_METHOD Column_clear(lua_State *L) {
-	/* Clears a Column */
+/* Clears a Column */
+WSLUA_METHOD
+Column_clear(lua_State *L)
+{
     Column c = checkColumn(L,1);
 
     if (!(c && c->cinfo)) return 0;
@@ -398,9 +452,11 @@ WSLUA_METHOD Column_clear(lua_State *L) {
     return 0;
 }
 
-WSLUA_METHOD Column_set(lua_State *L) {
-	/* Sets the text of a Column */
+/* Sets the text of a Column */
 #define WSLUA_ARG_Column_set_TEXT 2 /* The text to which to set the Column */
+WSLUA_METHOD
+Column_set(lua_State *L)
+{
     Column c = checkColumn(L,1);
     const gchar* s = luaL_checkstring(L,WSLUA_ARG_Column_set_TEXT);
 
@@ -414,9 +470,11 @@ WSLUA_METHOD Column_set(lua_State *L) {
     return 0;
 }
 
-WSLUA_METHOD Column_append(lua_State *L) {
-	/* Appends text to a Column */
+/* Appends text to a Column */
 #define WSLUA_ARG_Column_append_TEXT 2 /* The text to append to the Column */
+WSLUA_METHOD
+Column_append(lua_State *L)
+{
     Column c = checkColumn(L,1);
     const gchar* s = luaL_checkstring(L,WSLUA_ARG_Column_append_TEXT);
 
@@ -430,9 +488,11 @@ WSLUA_METHOD Column_append(lua_State *L) {
     return 0;
 }
 
-WSLUA_METHOD Column_preppend(lua_State *L) {
-	/* Prepends text to a Column */
+/* Prepends text to a Column */
 #define WSLUA_ARG_Column_prepend_TEXT 2 /* The text to prepend to the Column */
+WSLUA_METHOD
+Column_preppend(lua_State *L)
+{
     Column c = checkColumn(L,1);
     const gchar* s = luaL_checkstring(L,WSLUA_ARG_Column_prepend_TEXT);
 
@@ -463,7 +523,8 @@ WSLUA_META Column_meta[] = {
 };
 
 
-int Column_register(lua_State *L) {
+int
+Column_register(lua_State *L) {
     WSLUA_REGISTER_CLASS(Column);
     return 1;
 }
@@ -473,19 +534,22 @@ int Column_register(lua_State *L) {
 
 
 
-WSLUA_CLASS_DEFINE(Columns,NOP,NOP);
 /* The Columns of the packet list. */
+WSLUA_CLASS_DEFINE(Columns,NOP,NOP);
 
-WSLUA_METAMETHOD Columns__tostring(lua_State *L) {
+WSLUA_METAMETHOD
+Columns__tostring(lua_State *L)
+{
     lua_pushstring(L,"Columns");
-    WSLUA_RETURN(1);
-    /* The string "Columns", no real use, just for debugging purposes. */
+    WSLUA_RETURN(1); /* The string "Columns", no real use, just for debugging purposes. */
 }
 
-WSLUA_METAMETHOD Columns__newindex(lua_State *L) {
-	/* Sets the text of a specific column */
+/* Sets the text of a specific column */
 #define WSLUA_ARG_Columns__newindex_COLUMN 2 /* The name of the column to set */
 #define WSLUA_ARG_Columns__newindex_TEXT 3 /* The text for the column */
+WSLUA_METAMETHOD
+Columns__newindex(lua_State *L)
+{
     Columns cols = checkColumns(L,1);
     const struct col_names_t* cn;
     const char* colname;
@@ -507,12 +571,14 @@ WSLUA_METAMETHOD Columns__newindex(lua_State *L) {
         }
     }
 
-	WSLUA_ARG_ERROR(Columns__newindex,COLUMN,"the column name must be a valid column");
+    WSLUA_ARG_ERROR(Columns__newindex,COLUMN,"the column name must be a valid column");
 
     return 0;
 }
 
-WSLUA_METAMETHOD Columns_index(lua_State *L) {
+WSLUA_METAMETHOD
+Columns_index(lua_State *L)
+{
     Columns cols = checkColumns(L,1);
     const struct col_names_t* cn;
     const char* colname = luaL_checkstring(L,2);
@@ -550,7 +616,9 @@ WSLUA_METAMETHOD Columns_index(lua_State *L) {
     return 0;
 }
 
-static int Columns_gc(lua_State* L) {
+static int
+Columns_gc(lua_State* L)
+{
     Columns cols = checkColumns(L,1);
 
     if (!cols) return 0;
@@ -574,16 +642,23 @@ static const luaL_reg Columns_meta[] = {
 };
 
 
-int Columns_register(lua_State *L) {
+int
+Columns_register(lua_State *L)
+{
     WSLUA_REGISTER_META(Columns);
     return 1;
 }
 
 
-WSLUA_CLASS_DEFINE(Pinfo,FAIL_ON_NULL("expired pinfo"),NOP);
 /* Packet information */
+WSLUA_CLASS_DEFINE(Pinfo,FAIL_ON_NULL("expired pinfo"),NOP);
 
-static int Pinfo_tostring(lua_State *L) { lua_pushstring(L,"a Pinfo"); return 1; }
+static int
+Pinfo_tostring(lua_State *L)
+{
+    lua_pushstring(L,"a Pinfo");
+    return 1;
+}
 
 #define PINFO_GET_NUMBER(name,val) static int name(lua_State *L) {  \
     Pinfo pinfo = checkPinfo(L,1); \
@@ -659,7 +734,9 @@ PINFO_GET_ADDRESS(Pinfo_dst,dst)
 
 PINFO_GET_LIGHTUSERDATA(Pinfo_private_data, pinfo->ws_pinfo->private_data)
 
-static int Pinfo_visited(lua_State *L) {
+static int
+Pinfo_visited(lua_State *L)
+{
     Pinfo pinfo = checkPinfo(L,1);
     if (!pinfo) return 0;
     if (pinfo->expired) {
@@ -671,7 +748,9 @@ static int Pinfo_visited(lua_State *L) {
 }
 
 
-static int Pinfo_match(lua_State *L) {
+static int
+Pinfo_match(lua_State *L)
+{
     Pinfo pinfo = checkPinfo(L,1);
 
     if (!pinfo) return 0;
@@ -689,7 +768,9 @@ static int Pinfo_match(lua_State *L) {
     return 1;
 }
 
-static int Pinfo_columns(lua_State *L) {
+static int
+Pinfo_columns(lua_State *L)
+{
     Columns cols = NULL;
     Pinfo pinfo = checkPinfo(L,1);
     const gchar* colname = luaL_optstring(L,2,NULL);
@@ -731,12 +812,16 @@ typedef enum {
     PARAM_PORT_TYPE
 } pinfo_param_type_t;
 
-static int pushnil_param(lua_State* L, packet_info* pinfo _U_, pinfo_param_type_t pt _U_ ) {
+static int
+pushnil_param(lua_State* L, packet_info* pinfo _U_, pinfo_param_type_t pt _U_ )
+{
     lua_pushnil(L);
     return 1;
 }
 
-static int Pinfo_set_addr(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt) {
+static int
+Pinfo_set_addr(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt)
+{
     const address* from = checkAddress(L,1);
     address* to;
 
@@ -778,7 +863,9 @@ static int Pinfo_set_addr(lua_State* L, packet_info* pinfo, pinfo_param_type_t p
     return 0;
 }
 
-static int Pinfo_set_int(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt) {
+static int
+Pinfo_set_int(lua_State* L, packet_info* pinfo, pinfo_param_type_t pt)
+{
     gint64 v = luaL_checkint(L,1);
 
     if (!pinfo) {
@@ -816,7 +903,9 @@ typedef struct _pinfo_method_t {
     pinfo_param_type_t param;
 } pinfo_method_t;
 
-static int Pinfo_hi(lua_State *L) {
+static int
+Pinfo_hi(lua_State *L)
+{
     Pinfo pinfo = checkPinfo(L,1);
     Address addr = g_malloc(sizeof(address));
 
@@ -836,7 +925,9 @@ static int Pinfo_hi(lua_State *L) {
     return 1;
 }
 
-static int Pinfo_lo(lua_State *L) {
+static int
+Pinfo_lo(lua_State *L)
+{
     Pinfo pinfo = checkPinfo(L,1);
     Address addr = g_malloc(sizeof(address));
 
@@ -947,12 +1038,16 @@ static const pinfo_method_t Pinfo_methods[] = {
 };
 
 
-static int pushnil(lua_State* L) {
+static int
+pushnil(lua_State* L)
+{
     lua_pushnil(L);
     return 1;
 }
 
-static int Pinfo_index(lua_State* L) {
+static int
+Pinfo_index(lua_State* L)
+{
     Pinfo pinfo = checkPinfo(L,1);
     const gchar* name = luaL_checkstring(L,2);
     lua_CFunction method = pushnil;
@@ -978,7 +1073,9 @@ static int Pinfo_index(lua_State* L) {
     return method(L);
 }
 
-static int Pinfo_setindex(lua_State* L) {
+static int
+Pinfo_setindex(lua_State* L)
+{
     Pinfo pinfo = checkPinfo(L,1);
     const gchar* name = luaL_checkstring(L,2);
     int (*method)(lua_State*, packet_info* pinfo, pinfo_param_type_t) = pushnil_param;
@@ -1006,7 +1103,9 @@ static int Pinfo_setindex(lua_State* L) {
     return method(L,pinfo->ws_pinfo,param_type);
 }
 
-static int Pinfo_gc(lua_State* L) {
+static int
+Pinfo_gc(lua_State* L)
+{
     Pinfo pinfo = checkPinfo(L,1);
 
     if (!pinfo) return 0;
@@ -1028,7 +1127,9 @@ static const luaL_reg Pinfo_meta[] = {
     { NULL, NULL }
 };
 
-int Pinfo_register(lua_State* L) {
+int
+Pinfo_register(lua_State* L)
+{
     WSLUA_REGISTER_META(Pinfo);
     outstanding_Pinfo = g_ptr_array_new();
     outstanding_Column = g_ptr_array_new();