From 9963c4570b33ac53b598bfed4c19df4c3b620cae Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 10 Mar 2003 12:19:49 +0000 Subject: renamed string.c to misc.c and added a misc.h for the num2max5() function, and included that header file in recording.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3403 a1c6a512-1295-4272-9138-f99709370657 --- apps/misc.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ apps/misc.h | 24 +++++++++++++++++++ apps/recorder/recording.c | 4 +--- apps/string.c | 61 ----------------------------------------------- 4 files changed, 86 insertions(+), 64 deletions(-) create mode 100644 apps/misc.c create mode 100644 apps/misc.h delete mode 100644 apps/string.c (limited to 'apps') diff --git a/apps/misc.c b/apps/misc.c new file mode 100644 index 0000000000..0226cc2b2f --- /dev/null +++ b/apps/misc.c @@ -0,0 +1,61 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "sprintf.h" +#define ONE_KILOBYTE 1024 +#define ONE_MEGABYTE (1024*1024) + +/* The point of this function would be to return a string of the input data, + but never longer than 5 columns. Add suffix k and M when suitable... + Make sure to have space for 6 bytes in the buffer. 5 letters plus the + terminating zero byte. */ +char *num2max5(unsigned int bytes, char *max5) +{ + if(bytes < 100000) { + snprintf(max5, 6, "%5d", bytes); + return max5; + } + if(bytes < (9999*ONE_KILOBYTE)) { + snprintf(max5, 6, "%4dk", bytes/ONE_KILOBYTE); + return max5; + } + if(bytes < (100*ONE_MEGABYTE)) { + /* 'XX.XM' is good as long as we're less than 100 megs */ + snprintf(max5, 6, "%2d.%0dM", + bytes/ONE_MEGABYTE, + (bytes%ONE_MEGABYTE)/(ONE_MEGABYTE/10) ); + return max5; + } + snprintf(max5, 6, "%4dM", bytes/ONE_MEGABYTE); + return max5; +} + +#ifdef TEST_MAX5 +int main(int argc, char **argv) +{ + char buffer[32]; + if(argc>1) { + printf("%d => %s\n", + atoi(argv[1]), + num2max5(atoi(argv[1]), buffer)); + } + return 0; +} + +#endif diff --git a/apps/misc.h b/apps/misc.h new file mode 100644 index 0000000000..b5cf896b28 --- /dev/null +++ b/apps/misc.h @@ -0,0 +1,24 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* The point of this function would be to return a string of the input data, + but never longer than 5 columns. Add suffix k and M when suitable... + Make sure to have space for 6 bytes in the buffer. 5 letters plus the + terminating zero byte. */ +char *num2max5(unsigned int bytes, char *max5); diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 8af01f4c52..96cea40648 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -39,9 +39,7 @@ #include "sound_menu.h" #include "timefuncs.h" #include "debug.h" -#include "string.h" - -extern char *num2max5(unsigned int bytes, char *max5); +#include "misc.h" bool f2_rec_screen(void); bool f3_rec_screen(void); diff --git a/apps/string.c b/apps/string.c deleted file mode 100644 index 0226cc2b2f..0000000000 --- a/apps/string.c +++ /dev/null @@ -1,61 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2002 by Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "sprintf.h" -#define ONE_KILOBYTE 1024 -#define ONE_MEGABYTE (1024*1024) - -/* The point of this function would be to return a string of the input data, - but never longer than 5 columns. Add suffix k and M when suitable... - Make sure to have space for 6 bytes in the buffer. 5 letters plus the - terminating zero byte. */ -char *num2max5(unsigned int bytes, char *max5) -{ - if(bytes < 100000) { - snprintf(max5, 6, "%5d", bytes); - return max5; - } - if(bytes < (9999*ONE_KILOBYTE)) { - snprintf(max5, 6, "%4dk", bytes/ONE_KILOBYTE); - return max5; - } - if(bytes < (100*ONE_MEGABYTE)) { - /* 'XX.XM' is good as long as we're less than 100 megs */ - snprintf(max5, 6, "%2d.%0dM", - bytes/ONE_MEGABYTE, - (bytes%ONE_MEGABYTE)/(ONE_MEGABYTE/10) ); - return max5; - } - snprintf(max5, 6, "%4dM", bytes/ONE_MEGABYTE); - return max5; -} - -#ifdef TEST_MAX5 -int main(int argc, char **argv) -{ - char buffer[32]; - if(argc>1) { - printf("%d => %s\n", - atoi(argv[1]), - num2max5(atoi(argv[1]), buffer)); - } - return 0; -} - -#endif -- cgit v1.2.3