[PATCH 1/2] Move string_to_uint* functions to separate file
Dmitry V. Levin
ldv at altlinux.org
Tue Aug 22 16:31:22 UTC 2017
On Tue, Aug 22, 2017 at 03:35:02PM +0300, Edgar Kaziakhmedov wrote:
> To allow usage of utility function 'string_to_uint*' by other binaries
> included in the strace package and avoid useless includes of
> unnecessary headers, that are needed for util.c.
>
> * string_to_uint.h: New file.
> * defs.h: Include it.
> (string_to_uint_ex, string_to_uint_upto, string_to_uint): Move to
> string_to_uint.h.
> * util.c (string_to_uint_ex, string_to_uint): Move ...
> * string_to_uint.c: ... to the new file.
> * Makefile.am (strace_SOURCES): Add string_to_uint.h and string_to_uint.c.
>
> Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov at virtuozzo.com>
> ---
> Makefile.am | 2 ++
> defs.h | 10 +-------
> string_to_uint.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> string_to_uint.h | 41 ++++++++++++++++++++++++++++++++
> util.c | 32 -------------------------
> 5 files changed, 115 insertions(+), 41 deletions(-)
> create mode 100644 string_to_uint.c
> create mode 100644 string_to_uint.h
>
> diff --git a/Makefile.am b/Makefile.am
> index 2a477f68..53115cd5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -284,6 +284,8 @@ strace_SOURCES = \
> statx.c \
> statx.h \
> strace.c \
> + string_to_uint.h \
> + string_to_uint.c \
> swapon.c \
> syscall.c \
> sysctl.c \
> diff --git a/defs.h b/defs.h
> index e6659a57..dddad0c9 100644
> --- a/defs.h
> +++ b/defs.h
> @@ -58,6 +58,7 @@
> #include "kernel_types.h"
> #include "macros.h"
> #include "mpers_type.h"
> +#include "string_to_uint.h"
> #include "sysent.h"
> #include "xmalloc.h"
>
> @@ -510,15 +511,6 @@ void dyxlat_add_pair(struct dyxlat *, uint64_t val, const char *str, size_t len)
> const struct xlat *genl_families_xlat(void);
>
> extern unsigned long get_pagesize(void);
> -extern int
> -string_to_uint_ex(const char *str, char **endptr,
> - unsigned int max_val, const char *accepted_ending);
> -extern int string_to_uint(const char *str);
> -static inline int
> -string_to_uint_upto(const char *const str, unsigned int max_val)
> -{
> - return string_to_uint_ex(str, NULL, max_val, NULL);
> -}
> extern int next_set_bit(const void *bit_array, unsigned cur_bit, unsigned size_bits);
>
> /*
> diff --git a/string_to_uint.c b/string_to_uint.c
> new file mode 100644
> index 00000000..1cebceae
> --- /dev/null
> +++ b/string_to_uint.c
> @@ -0,0 +1,71 @@
> +/*
> + * Copyright (c) 2001-2017 The strace developers.
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + * 3. The name of the author may not be used to endorse or promote products
> + * derived from this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
> +#include <errno.h>
> +#include <limits.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +#include "string_to_uint.h"
> +
> +int
> +string_to_uint_ex(const char *const str, char **const endptr,
> + const unsigned int max_val, const char *const accepted_ending)
> +{
> + char *end;
> + long val;
> +
> + if (!*str)
> + return -1;
> +
> + errno = 0;
> + val = strtol(str, &end, 10);
> +
> + if (str == end || val < 0 || (unsigned long) val > max_val
> + || (val == LONG_MAX && errno == ERANGE))
> + return -1;
> +
> + if (*end && (!accepted_ending || !strchr(accepted_ending, *end)))
> + return -1;
> +
> + if (endptr)
> + *endptr = end;
> +
> + return (int) val;
> +}
> +
> +int
> +string_to_uint(const char *const str)
> +{
> + return string_to_uint_upto(str, INT_MAX);
> +}
> +
> +
"git am" complains:
Applying: Move string_to_uint* functions to separate file
.git/rebase-apply/patch:127: new blank line at EOF.
> diff --git a/string_to_uint.h b/string_to_uint.h
> new file mode 100644
> index 00000000..12a35649
> --- /dev/null
> +++ b/string_to_uint.h
> @@ -0,0 +1,41 @@
> +/*
> + * Copyright (c) 2001-2017 The strace developers.
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + * notice, this list of conditions and the following disclaimer in the
> + * documentation and/or other materials provided with the distribution.
> + * 3. The name of the author may not be used to endorse or promote products
> + * derived from this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#ifndef STRACE_STRING_TO_UINT
> +#define STRACE_STRING_TO_UINT
STRACE_STRING_TO_UINT_H?
--
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20170822/067000e5/attachment.bin>
More information about the Strace-devel
mailing list