Module Name: src
Committed By: rillig
Date: Sat Aug 8 14:43:28 UTC 2020
Modified Files:
src/usr.bin/make: enum.c enum.h
Log Message:
make(1): fix CRLF line endings in newly added files
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/enum.c src/usr.bin/make/enum.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/enum.c
diff -u src/usr.bin/make/enum.c:1.1 src/usr.bin/make/enum.c:1.2
--- src/usr.bin/make/enum.c:1.1 Sat Aug 8 13:50:23 2020
+++ src/usr.bin/make/enum.c Sat Aug 8 14:43:28 2020
@@ -1,83 +1,83 @@
-/* $NetBSD: enum.c,v 1.1 2020/08/08 13:50:23 rillig Exp $ */
-
-/*
- Copyright (c) 2020 Roland Illig <[email protected]>
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "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 COPYRIGHT HOLDER OR CONTRIBUTORS
- 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 MAKE_NATIVE
-static char rcsid[] = "$NetBSD: enum.c,v 1.1 2020/08/08 13:50:23 rillig Exp $";
-#else
-#include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: enum.c,v 1.1 2020/08/08 13:50:23 rillig Exp $");
-#endif
-#endif
-
-#include <assert.h>
-#include <string.h>
-
-#include "enum.h"
-
-/* Convert a bitset into a string representation showing the names of the
- * individual bits, or optionally shortcuts for groups of bits. */
-const char *
-Enum_ToString(char *buf, size_t buf_size, int value,
- const EnumToStringSpec *spec)
-{
- const char *buf_start = buf;
- const char *sep = "";
- size_t sep_len = 0;
-
- for (; spec->es_value != 0; spec++) {
- size_t name_len;
-
- if ((value & spec->es_value) != spec->es_value)
- continue;
- value &= ~spec->es_value;
-
- assert(buf_size >= sep_len + 1);
- memcpy(buf, sep, sep_len);
- buf += sep_len;
- buf_size -= sep_len;
-
- name_len = strlen(spec->es_name);
- assert(buf_size >= name_len + 1);
- memcpy(buf, spec->es_name, name_len);
- buf += name_len;
- buf_size -= name_len;
-
- sep = ENUM__SEP;
- sep_len = sizeof ENUM__SEP - 1;
- }
- assert(value == 0);
-
- if (buf == buf_start)
- return "none";
-
- assert(buf_size >= 1);
- buf[0] = '\0';
- return buf_start;
-}
+/* $NetBSD: enum.c,v 1.2 2020/08/08 14:43:28 rillig Exp $ */
+
+/*
+ Copyright (c) 2020 Roland Illig <[email protected]>
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 COPYRIGHT HOLDER OR CONTRIBUTORS
+ 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 MAKE_NATIVE
+static char rcsid[] = "$NetBSD: enum.c,v 1.2 2020/08/08 14:43:28 rillig Exp $";
+#else
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: enum.c,v 1.2 2020/08/08 14:43:28 rillig Exp $");
+#endif
+#endif
+
+#include <assert.h>
+#include <string.h>
+
+#include "enum.h"
+
+/* Convert a bitset into a string representation showing the names of the
+ * individual bits, or optionally shortcuts for groups of bits. */
+const char *
+Enum_ToString(char *buf, size_t buf_size, int value,
+ const EnumToStringSpec *spec)
+{
+ const char *buf_start = buf;
+ const char *sep = "";
+ size_t sep_len = 0;
+
+ for (; spec->es_value != 0; spec++) {
+ size_t name_len;
+
+ if ((value & spec->es_value) != spec->es_value)
+ continue;
+ value &= ~spec->es_value;
+
+ assert(buf_size >= sep_len + 1);
+ memcpy(buf, sep, sep_len);
+ buf += sep_len;
+ buf_size -= sep_len;
+
+ name_len = strlen(spec->es_name);
+ assert(buf_size >= name_len + 1);
+ memcpy(buf, spec->es_name, name_len);
+ buf += name_len;
+ buf_size -= name_len;
+
+ sep = ENUM__SEP;
+ sep_len = sizeof ENUM__SEP - 1;
+ }
+ assert(value == 0);
+
+ if (buf == buf_start)
+ return "none";
+
+ assert(buf_size >= 1);
+ buf[0] = '\0';
+ return buf_start;
+}
Index: src/usr.bin/make/enum.h
diff -u src/usr.bin/make/enum.h:1.1 src/usr.bin/make/enum.h:1.2
--- src/usr.bin/make/enum.h:1.1 Sat Aug 8 13:50:23 2020
+++ src/usr.bin/make/enum.h Sat Aug 8 14:43:28 2020
@@ -1,93 +1,93 @@
-/* $NetBSD: enum.h,v 1.1 2020/08/08 13:50:23 rillig Exp $ */
-
-/*
- Copyright (c) 2020 Roland Illig <[email protected]>
- 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.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "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 COPYRIGHT HOLDER OR CONTRIBUTORS
- 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 MAKE_ENUM_H
-#define MAKE_ENUM_H
-
-/*
- * Generate string representation for bitmasks.
- */
-
-typedef struct {
- int es_value;
- const char *es_name;
-} EnumToStringSpec;
-
-const char *Enum_ToString(char *, size_t, int, const EnumToStringSpec *);
-
-#define ENUM__SEP "|"
-
-#define ENUM__JOIN_1(v1) \
- #v1
-#define ENUM__JOIN_2(v1, v2) \
- #v1 ENUM__SEP ENUM__JOIN_1(v2)
-#define ENUM__JOIN_3(v1, v2, v3) \
- #v1 ENUM__SEP ENUM__JOIN_2(v2, v3)
-#define ENUM__JOIN_4(v1, v2, v3, v4) \
- #v1 ENUM__SEP ENUM__JOIN_3(v2, v3, v4)
-#define ENUM__JOIN_5(v1, v2, v3, v4, v5) \
- #v1 ENUM__SEP ENUM__JOIN_4(v2, v3, v4, v5)
-#define ENUM__JOIN_6(v1, v2, v3, v4, v5, v6) \
- #v1 ENUM__SEP ENUM__JOIN_5(v2, v3, v4, v5, v6)
-#define ENUM__JOIN_7(v1, v2, v3, v4, v5, v6, v7) \
- #v1 ENUM__SEP ENUM__JOIN_6(v2, v3, v4, v5, v6, v7)
-
-#define ENUM__RTTI(typnam, specs, joined) \
- static const EnumToStringSpec typnam ## _ ## ToStringSpecs[] = specs; \
- static const size_t typnam ## _ ## ToStringSize = sizeof joined
-
-#define ENUM__SPEC(v) { v, #v }
-
-#define ENUM__SPEC_3(v1, v2, v3) { \
- ENUM__SPEC(v1), \
- ENUM__SPEC(v2), \
- ENUM__SPEC(v3), \
- { 0, "" } }
-
-#define ENUM__SPEC_7(v1, v2, v3, v4, v5, v6, v7) { \
- ENUM__SPEC(v1), \
- ENUM__SPEC(v2), \
- ENUM__SPEC(v3), \
- ENUM__SPEC(v4), \
- ENUM__SPEC(v5), \
- ENUM__SPEC(v6), \
- ENUM__SPEC(v7), \
- { 0, "" } }
-
-#define ENUM_RTTI_3(typnam, v1, v2, v3) \
- ENUM__RTTI(typnam, \
- ENUM__SPEC_3(v1, v2, v3), \
- ENUM__JOIN_3(v1, v2, v3))
-
-#define ENUM_RTTI_7(typnam, v1, v2, v3, v4, v5, v6, v7) \
- ENUM__RTTI(typnam, \
- ENUM__SPEC_7(v1, v2, v3, v4, v5, v6, v7), \
- ENUM__JOIN_7(v1, v2, v3, v4, v5, v6, v7))
-
-#endif
+/* $NetBSD: enum.h,v 1.2 2020/08/08 14:43:28 rillig Exp $ */
+
+/*
+ Copyright (c) 2020 Roland Illig <[email protected]>
+ 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.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "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 COPYRIGHT HOLDER OR CONTRIBUTORS
+ 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 MAKE_ENUM_H
+#define MAKE_ENUM_H
+
+/*
+ * Generate string representation for bitmasks.
+ */
+
+typedef struct {
+ int es_value;
+ const char *es_name;
+} EnumToStringSpec;
+
+const char *Enum_ToString(char *, size_t, int, const EnumToStringSpec *);
+
+#define ENUM__SEP "|"
+
+#define ENUM__JOIN_1(v1) \
+ #v1
+#define ENUM__JOIN_2(v1, v2) \
+ #v1 ENUM__SEP ENUM__JOIN_1(v2)
+#define ENUM__JOIN_3(v1, v2, v3) \
+ #v1 ENUM__SEP ENUM__JOIN_2(v2, v3)
+#define ENUM__JOIN_4(v1, v2, v3, v4) \
+ #v1 ENUM__SEP ENUM__JOIN_3(v2, v3, v4)
+#define ENUM__JOIN_5(v1, v2, v3, v4, v5) \
+ #v1 ENUM__SEP ENUM__JOIN_4(v2, v3, v4, v5)
+#define ENUM__JOIN_6(v1, v2, v3, v4, v5, v6) \
+ #v1 ENUM__SEP ENUM__JOIN_5(v2, v3, v4, v5, v6)
+#define ENUM__JOIN_7(v1, v2, v3, v4, v5, v6, v7) \
+ #v1 ENUM__SEP ENUM__JOIN_6(v2, v3, v4, v5, v6, v7)
+
+#define ENUM__RTTI(typnam, specs, joined) \
+ static const EnumToStringSpec typnam ## _ ## ToStringSpecs[] = specs; \
+ static const size_t typnam ## _ ## ToStringSize = sizeof joined
+
+#define ENUM__SPEC(v) { v, #v }
+
+#define ENUM__SPEC_3(v1, v2, v3) { \
+ ENUM__SPEC(v1), \
+ ENUM__SPEC(v2), \
+ ENUM__SPEC(v3), \
+ { 0, "" } }
+
+#define ENUM__SPEC_7(v1, v2, v3, v4, v5, v6, v7) { \
+ ENUM__SPEC(v1), \
+ ENUM__SPEC(v2), \
+ ENUM__SPEC(v3), \
+ ENUM__SPEC(v4), \
+ ENUM__SPEC(v5), \
+ ENUM__SPEC(v6), \
+ ENUM__SPEC(v7), \
+ { 0, "" } }
+
+#define ENUM_RTTI_3(typnam, v1, v2, v3) \
+ ENUM__RTTI(typnam, \
+ ENUM__SPEC_3(v1, v2, v3), \
+ ENUM__JOIN_3(v1, v2, v3))
+
+#define ENUM_RTTI_7(typnam, v1, v2, v3, v4, v5, v6, v7) \
+ ENUM__RTTI(typnam, \
+ ENUM__SPEC_7(v1, v2, v3, v4, v5, v6, v7), \
+ ENUM__JOIN_7(v1, v2, v3, v4, v5, v6, v7))
+
+#endif
