projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hash: factor, and guard against misbehaving hasher function
[gnulib.git]
/
lib
/
human.h
diff --git
a/lib/human.h
b/lib/human.h
index
7282634
..
d6b6ed5
100644
(file)
--- a/
lib/human.h
+++ b/
lib/human.h
@@
-1,12
+1,12
@@
/* human.h -- print human readable file size
/* human.h -- print human readable file size
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
,
+
2006, 2007, 2009, 2010
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,27
+14,19
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert and Larry McVoy. */
#ifndef HUMAN_H_
# define HUMAN_H_ 1
/* Written by Paul Eggert and Larry McVoy. */
#ifndef HUMAN_H_
# define HUMAN_H_ 1
-# if HAVE_CONFIG_H
-# include <config.h>
-# endif
-
# include <limits.h>
# include <stdbool.h>
# include <limits.h>
# include <stdbool.h>
+# include <stdint.h>
+# include <unistd.h>
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
-# if HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+# include <xstrtol.h>
/* A conservative bound on the maximum length of a human-readable string.
The output can be the square of the largest uintmax_t, so double
/* A conservative bound on the maximum length of a human-readable string.
The output can be the square of the largest uintmax_t, so double
@@
-87,6
+79,6
@@
enum
char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t);
char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t);
-
int human_options (char const *, bool
, uintmax_t *);
+
enum strtol_error human_options (char const *, int *
, uintmax_t *);
#endif /* HUMAN_H_ */
#endif /* HUMAN_H_ */