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.)
This commit is contained in:
@ -8,13 +8,6 @@
|
||||
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
|
||||
*/
|
||||
|
||||
#include <features.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include "libbb.h"
|
||||
|
||||
/* For 2.6, use the cleaned up header to get the 64 bit API. */
|
||||
@ -59,7 +52,7 @@ char *query_loop(const char *device)
|
||||
|
||||
if ((fd = open(device, O_RDONLY)) < 0) return 0;
|
||||
if (!ioctl(fd, BB_LOOP_GET_STATUS, &loopinfo))
|
||||
dev=bb_xasprintf("%ld %s", (long) loopinfo.lo_offset,
|
||||
dev=xasprintf("%ld %s", (long) loopinfo.lo_offset,
|
||||
(char *)loopinfo.lo_file_name);
|
||||
close(fd);
|
||||
|
||||
|
Reference in New Issue
Block a user