[PATCH 1/4] Move string_to_uint* functions to separate file

Dmitry V. Levin ldv at altlinux.org
Mon Aug 21 16:09:21 UTC 2017


On Mon, Aug 21, 2017 at 03:06:56AM +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 "string_to_uint.h".

Just "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, string_to_uint.c.

Add string_to_uint.h and string_to_uint.c.

[...]
> diff --git a/string_to_uint.c b/string_to_uint.c
> new file mode 100644
> index 00000000..d2b377e3
> --- /dev/null
> +++ b/string_to_uint.c
> @@ -0,0 +1,67 @@
> +/*
> + * 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.
> + */
> +
> +#include <errno.h>
> +#include <limits.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +#include "string_to_uint.h"

Please ensure that config.h is included before any system header.


-- 
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/20170821/42d89290/attachment.bin>


More information about the Strace-devel mailing list