From 1b1fd61295d76b734f68309d0057699a1ba1cc37 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 14 Jan 2010 12:47:12 -0800 Subject: [PATCH] Remove definitions that are now in bionic libc --- sh/miscbltin.c | 2 -- toolbox/newfs_msdos.c | 29 ----------------------------- 2 files changed, 31 deletions(-) diff --git a/sh/miscbltin.c b/sh/miscbltin.c index 1a8e252bd..d89029afd 100644 --- a/sh/miscbltin.c +++ b/sh/miscbltin.c @@ -277,8 +277,6 @@ umaskcmd(int argc, char **argv) return 0; } -typedef unsigned long rlim_t; - #if 1 /* * ulimit builtin diff --git a/toolbox/newfs_msdos.c b/toolbox/newfs_msdos.c index 49042c4a8..8e611c60f 100644 --- a/toolbox/newfs_msdos.c +++ b/toolbox/newfs_msdos.c @@ -235,35 +235,6 @@ static void setstr(u_int8_t *, const char *, size_t); static void usage(void); #ifdef ANDROID -static void err(int val, const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - char *fmt2; - asprintf(&fmt2, "%s\n", fmt); - vfprintf(stderr, fmt2, ap); - free(fmt2); - va_end(ap); -} - -static void errx(int val, const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - char *fmt2; - asprintf(&fmt2, "%s\n", fmt); - vfprintf(stderr, fmt2, ap); - free(fmt2); - va_end(ap); -} - -static void warnx(const char *fmt, ...) { - va_list ap; - va_start(ap, fmt); - char *fmt2; - asprintf(&fmt2, "%s\n", fmt); - vfprintf(stderr, fmt2, ap); - free(fmt2); - va_end(ap); -} #define powerof2(x) ((((x) - 1) & (x)) == 0) #define howmany(x, y) (((x) + ((y) - 1)) / (y)) #define MAX(x,y) ((x) > (y) ? (x) : (y))