On Fri, Oct 22, 2010 at 08:16:29PM -0300, Davidlohr Bueso wrote:
> Signed-off-by: Davidlohr Bueso <dave@xxxxxxx>
> ---
> include/Makefile.am | 4 +-
> lib/Makefile.am | 4 +-
> lib/strtosize.c | 148 ----------------------------------
> lib/strutils.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++
> misc-utils/Makefile.am | 4 +-
> mount/Makefile.am | 6 +-
> schedutils/Makefile.am | 2 +-
> schedutils/chrt.c | 6 +-
> schedutils/ionice.c | 12 ++--
> schedutils/schedutils.c | 34 --------
> schedutils/schedutils.h | 7 --
> schedutils/taskset.c | 4 +-
> sys-utils/Makefile.am | 2 +-
> 13 files changed, 226 insertions(+), 211 deletions(-)
> delete mode 100644 lib/strtosize.c
> create mode 100644 lib/strutils.c
> delete mode 100644 schedutils/schedutils.c
> delete mode 100644 schedutils/schedutils.h
Incomplete, you forgot
git add include/strutils.h
git rm include/strtosize.h
and also
$ grep -r "include \"strtosize.h\"" *
misc-utils/wipefs.c:#include "strtosize.h"
misc-utils/blkid.c:#include "strtosize.h"
mount/umount.c:#include "strtosize.h"
mount/mount.c:#include "strtosize.h"
mount/lomount.c:#include "strtosize.h"
sys-utils/fallocate.c:#include "strtosize.h"
files have to updated to include strutils.h.
> diff --git a/include/Makefile.am b/include/Makefile.am
> index 3b93acd..ac7306c 100644
> --- a/include/Makefile.am
> +++ b/include/Makefile.am
> @@ -20,11 +20,11 @@ dist_noinst_HEADERS = \
> nls.h \
> pathnames.h \
> setproctitle.h \
> - strtosize.h \
> swapheader.h \
> tt.h \
> usleep.h \
> wholedisk.h \
> widechar.h \
> writeall.h \
> - xstrncpy.h
> + xstrncpy.h \
> + strutils.h
Please, add stuff from xstrncpy.h to strutils.h too.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
