diff options
| author | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /networking/ether-wake.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2 busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip | |
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only
had one user), clean up lots of #includes... General cleanup pass. What I've
been doing for the last couple days.
And it conflicts! I've removed httpd.c from this checkin due to somebody else
touching that file. It builds for me. I have to catch a bus. (Now you know
why I'm looking forward to Mercurial.)
Diffstat (limited to 'networking/ether-wake.c')
| -rw-r--r-- | networking/ether-wake.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index 1803d2265..75f065cdc 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
| @@ -65,25 +65,10 @@ | |||
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | #include <unistd.h> | ||
| 69 | #include <stdlib.h> | ||
| 70 | #include <stdio.h> | ||
| 71 | #include <errno.h> | ||
| 72 | #include <ctype.h> | ||
| 73 | #include <string.h> | ||
| 74 | |||
| 75 | #include <sys/socket.h> | ||
| 76 | #include <sys/types.h> | ||
| 77 | #include <sys/ioctl.h> | ||
| 78 | #include <features.h> | ||
| 79 | #include <netpacket/packet.h> | 68 | #include <netpacket/packet.h> |
| 80 | #include <net/ethernet.h> | 69 | #include <net/ethernet.h> |
| 81 | #include <netdb.h> | ||
| 82 | #include <netinet/ether.h> | 70 | #include <netinet/ether.h> |
| 83 | |||
| 84 | #ifdef __linux__ | ||
| 85 | #include <linux/if.h> | 71 | #include <linux/if.h> |
| 86 | #endif | ||
| 87 | 72 | ||
| 88 | #include "busybox.h" | 73 | #include "busybox.h" |
| 89 | 74 | ||
| @@ -93,10 +78,10 @@ | |||
| 93 | */ | 78 | */ |
| 94 | #ifdef PF_PACKET | 79 | #ifdef PF_PACKET |
| 95 | # define whereto_t sockaddr_ll | 80 | # define whereto_t sockaddr_ll |
| 96 | # define make_socket() bb_xsocket(PF_PACKET, SOCK_RAW, 0) | 81 | # define make_socket() xsocket(PF_PACKET, SOCK_RAW, 0) |
| 97 | #else | 82 | #else |
| 98 | # define whereto_t sockaddr | 83 | # define whereto_t sockaddr |
| 99 | # define make_socket() bb_xsocket(AF_INET, SOCK_PACKET, SOCK_PACKET) | 84 | # define make_socket() xsocket(AF_INET, SOCK_PACKET, SOCK_PACKET) |
| 100 | #endif | 85 | #endif |
| 101 | 86 | ||
| 102 | #ifdef DEBUG | 87 | #ifdef DEBUG |