From d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 3 Aug 2006 15:41:12 +0000 Subject: 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.) --- networking/tftp.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'networking/tftp.c') diff --git a/networking/tftp.c b/networking/tftp.c index dfa599ab5..42fd9d2ca 100644 --- a/networking/tftp.c +++ b/networking/tftp.c @@ -19,18 +19,6 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * ------------------------------------------------------------------------- */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "busybox.h" @@ -159,7 +147,7 @@ static int tftp(const int cmd, const struct hostent *host, char *buf=xmalloc(tftp_bufsize += 4); if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { - /* need to unlink the localfile, so don't use bb_xsocket here. */ + /* need to unlink the localfile, so don't use xsocket here. */ bb_perror_msg("socket"); return EXIT_FAILURE; } @@ -167,7 +155,7 @@ static int tftp(const int cmd, const struct hostent *host, len = sizeof(sa); memset(&sa, 0, len); - bb_xbind(socketfd, (struct sockaddr *)&sa, len); + xbind(socketfd, (struct sockaddr *)&sa, len); sa.sin_family = host->h_addrtype; sa.sin_port = port; -- cgit v1.2.3-55-g6feb