|
 |
cd1e0c |
commit efefa7845601f551820fa17cb0808dbb3c3cc3dd
|
|
|
cd1e0c |
Author: Steve Dickson <steved@redhat.com>
|
|
|
cd1e0c |
Date: Wed Nov 13 09:32:00 2019 -0500
|
|
|
cd1e0c |
|
|
|
cd1e0c |
junction: Fixed debug statement to compile with -Werror=format=2 flag
|
|
|
cd1e0c |
|
|
|
cd1e0c |
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
cd1e0c |
|
|
|
cd1e0c |
diff --git a/support/junction/xml.c b/support/junction/xml.c
|
|
|
cd1e0c |
index 79b0770..7005e95 100644
|
|
|
cd1e0c |
--- a/support/junction/xml.c
|
|
|
cd1e0c |
+++ b/support/junction/xml.c
|
|
|
cd1e0c |
@@ -327,8 +327,8 @@ junction_parse_xml_read(const char *pathname, int fd, const char *name,
|
|
|
cd1e0c |
if (retval != FEDFS_OK)
|
|
|
cd1e0c |
return retval;
|
|
|
cd1e0c |
|
|
|
cd1e0c |
- xlog(D_CALL, "%s: XML document contained in junction:\n%.*s",
|
|
|
cd1e0c |
- __func__, len, buf);
|
|
|
cd1e0c |
+ xlog(D_CALL, "%s: XML document contained in junction:\n%ld.%s",
|
|
|
cd1e0c |
+ __func__, len, (char *)buf);
|
|
|
cd1e0c |
|
|
|
cd1e0c |
retval = junction_parse_xml_buf(pathname, name, buf, len, doc);
|
|
|
cd1e0c |
|
|
|
cd1e0c |
commit f7c0c0dc4a02d87965d3fbbab69786ca07fdecea
|
|
|
cd1e0c |
Author: Guillaume Rousse <guillomovitch@gmail.com>
|
|
|
cd1e0c |
Date: Fri Nov 22 10:20:03 2019 -0500
|
|
|
cd1e0c |
|
|
|
cd1e0c |
fix compilation with -Werror=format on i586
|
|
|
cd1e0c |
|
|
|
cd1e0c |
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
cd1e0c |
|
|
|
cd1e0c |
diff --git a/support/junction/xml.c b/support/junction/xml.c
|
|
|
cd1e0c |
index 7005e95..813110b 100644
|
|
|
cd1e0c |
--- a/support/junction/xml.c
|
|
|
cd1e0c |
+++ b/support/junction/xml.c
|
|
|
cd1e0c |
@@ -327,7 +327,7 @@ junction_parse_xml_read(const char *pathname, int fd, const char *name,
|
|
|
cd1e0c |
if (retval != FEDFS_OK)
|
|
|
cd1e0c |
return retval;
|
|
|
cd1e0c |
|
|
|
cd1e0c |
- xlog(D_CALL, "%s: XML document contained in junction:\n%ld.%s",
|
|
|
cd1e0c |
+ xlog(D_CALL, "%s: XML document contained in junction:\n%zu.%s",
|
|
|
cd1e0c |
__func__, len, (char *)buf);
|
|
|
cd1e0c |
|
|
|
cd1e0c |
retval = junction_parse_xml_buf(pathname, name, buf, len, doc);
|
|
|
cd1e0c |
diff --git a/tools/locktest/testlk.c b/tools/locktest/testlk.c
|
|
|
cd1e0c |
index b392f71..ea51f78 100644
|
|
|
cd1e0c |
--- a/tools/locktest/testlk.c
|
|
|
cd1e0c |
+++ b/tools/locktest/testlk.c
|
|
|
cd1e0c |
@@ -81,7 +81,7 @@ main(int argc, char **argv)
|
|
|
cd1e0c |
if (fl.l_type == F_UNLCK) {
|
|
|
cd1e0c |
printf("%s: no conflicting lock\n", fname);
|
|
|
cd1e0c |
} else {
|
|
|
cd1e0c |
- printf("%s: conflicting lock by %d on (%ld;%ld)\n",
|
|
|
cd1e0c |
+ printf("%s: conflicting lock by %d on (%zd;%zd)\n",
|
|
|
cd1e0c |
fname, fl.l_pid, fl.l_start, fl.l_len);
|
|
|
cd1e0c |
}
|
|
|
cd1e0c |
return 0;
|