Dash:
[t2.git] / package / filesystem / nfs-utils / hotfix-gcc-4.2.patch.avr32
blobbcca03e0c85962395304434e9e8f74ce3fc531ba
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # T2 SDE: package/*/nfs-utils/hotfix-gcc-4.2.patch.avr32
3 # Copyright (C) 2021 The T2 SDE Project
4
5 # This Copyright note is generated by scripts/Create-CopyPatch,
6 # more information can be found in the files COPYING and README.
7
8 # This patch file is dual-licensed. It is available under the license the
9 # patched project is licensed under, as long as it is an OpenSource license
10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
11 # of the GNU General Public License version 2 as used by the T2 SDE.
12 # --- T2-COPYRIGHT-NOTE-END ---
14 --- nfs-utils-2.4.3/utils/mount/stropts.c.vanilla       2021-10-07 12:31:46.430690497 +0200
15 +++ nfs-utils-2.4.3/utils/mount/stropts.c       2021-10-07 12:32:21.349692988 +0200
16 @@ -783,11 +783,11 @@
17                         fmt = "vers=%lu.%lu";
18                         break;
19                 }
20 -#pragma GCC diagnostic ignored "-Wformat-nonliteral"
21 +//#pragma GCC diagnostic ignored "-Wformat-nonliteral"
22                 snprintf(version_opt, sizeof(version_opt) - 1,
23                         fmt, mi->version.major,
24                         mi->version.minor);
25 -#pragma GCC diagnostic warning "-Wformat-nonliteral"
26 +//#pragma GCC diagnostic warning "-Wformat-nonliteral"
28                 if (po_append(options, version_opt) == PO_FAILED) {
29                         errno = EINVAL;
30 @@ -1094,9 +1094,9 @@
31                 if (nfs_try_mount(mi))
32                         return EX_SUCCESS;
34 -#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
35 +//#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
36                 if (errno == EBUSY && is_mountpoint(mi->node)) {
37 -#pragma GCC diagnostic warning "-Wdiscarded-qualifiers"
38 +//#pragma GCC diagnostic warning "-Wdiscarded-qualifiers"
39                         /*
40                          * EBUSY can happen when mounting a filesystem that
41                          * is already mounted or when the context= are
42 --- nfs-utils-2.4.3/utils/nfsstat/nfsstat.c.vanilla     2021-10-07 12:31:23.800688883 +0200
43 +++ nfs-utils-2.4.3/utils/nfsstat/nfsstat.c     2021-10-07 12:31:30.884689389 +0200
44 @@ -980,10 +980,10 @@
45                         }
46                         bufp = buf;
47                         for (; curindex < numvals; curindex++) {
48 -#pragma GCC diagnostic ignored "-Wformat-nonliteral"
49 +//#pragma GCC diagnostic ignored "-Wformat-nonliteral"
50                                 n = sscanf(bufp, fmt, &ip->valptr[curindex],
51                                                 &numconsumed);
52 -#pragma GCC diagnostic warning "-Wformat-nonliteral"
53 +//#pragma GCC diagnostic warning "-Wformat-nonliteral"
54                                 if (n != 1)
55                                         break;
56                                 if (is_proc) {