Author: biurrun Date: Fri Nov 20 15:12:18 2009 New Revision: 1736 Log: Reorder functions to avoid ugly forward declarations. Modified: trunk/test/ifdefgw.c trunk/test/iwessid.c Modified: trunk/test/ifdefgw.c ============================================================================== --- trunk/test/ifdefgw.c Fri Nov 20 14:55:11 2009 (r1735) +++ trunk/test/ifdefgw.c Fri Nov 20 15:12:18 2009 (r1736) @@ -65,7 +65,12 @@ #define RTF_NOTCACHED 0x0400 /* this route isn't cached */ #endif /* 0 */ -static void usage(const char *cmdname); + +static void usage(const char *cmdname) +{ + fprintf(stderr, + "Usage: %s\n", cmdname); +} int main(int argc, char *argv[]) { @@ -85,10 +90,3 @@ return 0; } - -static void usage(const char *cmdname) -{ - fprintf(stderr, - "Usage: %s\n", cmdname); -} - Modified: trunk/test/iwessid.c ============================================================================== --- trunk/test/iwessid.c Fri Nov 20 14:55:11 2009 (r1735) +++ trunk/test/iwessid.c Fri Nov 20 15:12:18 2009 (r1736) @@ -5,8 +5,29 @@ #include "iwlib.h" -static void print_essid(int skfd, char *ifname); -static void usage(const char *cmdname); +static void print_essid(int skfd, char *ifname) +{ + struct iwreq wrq; + struct wireless_info info; + + memset(&info, 0, sizeof(struct wireless_info)); + + wrq.u.essid.pointer = (caddr_t) info.nickname; + wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1; + wrq.u.essid.flags = 0; + + if (iw_get_ext(skfd, ifname, SIOCGIWESSID, &wrq) >= 0) { + if (wrq.u.data.length > 0) + printf("essid = %s\n", (char *)wrq.u.data.pointer); + } + +} + +static void usage(const char *cmdname) +{ + fprintf(stderr, + "Usage: %s ifname\n", cmdname); +} int main(int argc, char *argv[]) { @@ -39,27 +60,3 @@ return 0; } - -static void print_essid(int skfd, char *ifname) -{ - struct iwreq wrq; - struct wireless_info info; - - memset(&info, 0, sizeof(struct wireless_info)); - - wrq.u.essid.pointer = (caddr_t) info.nickname; - wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1; - wrq.u.essid.flags = 0; - - if (iw_get_ext(skfd, ifname, SIOCGIWESSID, &wrq) >= 0) { - if (wrq.u.data.length > 0) - printf("essid = %s\n", (char *)wrq.u.data.pointer); - } - -} - -static void usage(const char *cmdname) -{ - fprintf(stderr, - "Usage: %s ifname\n", cmdname); -}