<div dir="ltr">Hannes,<div><br></div><div>FYI, related to this patch,</div><div><br></div><div><div>commit 3e7763345a31e81318b70d7af68902984312f624</div><div>Author: Christophe Varoqui <<a href="mailto:christophe.varoqui@opensvc.com">christophe.varoqui@opensvc.com</a>></div>
<div>Date: Fri Dec 13 23:10:27 2013 +0100</div><div><br></div><div> [libmultipath] Fix a compilation warning</div><div> </div><div> Now that we chop the sysfs attribute strings, the size returned</div><div> by strlcpy is not used anymore. Remove the variable to tame</div>
<div> the compiler warning.</div><div><br></div><div>diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c</div><div>index ccd3b62..b7470f8 100644</div><div>--- a/libmultipath/discovery.c</div><div>+++ b/libmultipath/discovery.c</div>
<div>@@ -143,7 +143,6 @@ path_discovery (vector pathvec, struct config * conf, int flag)</div><div> extern ssize_t \</div><div> sysfs_get_##fname (struct udev_device * udev, char * buff, size_t len) \</div>
<div> { \</div><div>- ssize_t ret; \</div><div> const char * attr; \</div>
<div> const char * devname; \</div><div> \</div><div>@@ -163,7 +162,7 @@ sysfs_get_##fname (struct udev_device * udev, char * buff, size_t len) \</div>
<div> devname, #fname); \</div><div> return -EINVAL; \</div><div> } \</div>
<div>- ret = strlcpy(buff, attr, len); \</div><div>+ strlcpy(buff, attr, len); \</div><div> return strchop(buff); \</div>
<div> }</div></div><div><br></div><div>Best regards,</div><div>Christophe Varoqui</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Dec 13, 2013 at 1:14 PM, Hannes Reinecke <span dir="ltr"><<a href="mailto:hare@suse.de" target="_blank">hare@suse.de</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">Some sysfs attributes may contain trailing spaces, which only<br>
serve to confuse matters. So strip them before continuing.<br>
<br>
Signed-off-by: Hannes Reinecke <<a href="mailto:hare@suse.de">hare@suse.de</a>><br>
---<br>
libmultipath/discovery.c | 2 +-<br>
libmultipath/util.c | 3 ++-<br>
libmultipath/util.h | 2 +-<br>
3 files changed, 4 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c<br>
index d5557d9..d519c02 100644<br>
--- a/libmultipath/discovery.c<br>
+++ b/libmultipath/discovery.c<br>
@@ -164,7 +164,7 @@ sysfs_get_##fname (struct udev_device * udev, char * buff, size_t len) \<br>
return -EINVAL; \<br>
} \<br>
ret = strlcpy(buff, attr, len); \<br>
- return ret; \<br>
+ return strchop(buff); \<br>
}<br>
<br>
declare_sysfs_get_str(devtype);<br>
diff --git a/libmultipath/util.c b/libmultipath/util.c<br>
index a9f5939..e6fd11d 100644<br>
--- a/libmultipath/util.c<br>
+++ b/libmultipath/util.c<br>
@@ -10,13 +10,14 @@<br>
#include "vector.h"<br>
#include "structs.h"<br>
<br>
-void<br>
+size_t<br>
strchop(char *str)<br>
{<br>
int i;<br>
<br>
for (i=strlen(str)-1; i >=0 && isspace(str[i]); --i) ;<br>
str[++i] = '\0';<br>
+ return strlen(str);<br>
}<br>
<br>
int<br>
diff --git a/libmultipath/util.h b/libmultipath/util.h<br>
index 44184a1..7b67dff 100644<br>
--- a/libmultipath/util.h<br>
+++ b/libmultipath/util.h<br>
@@ -1,7 +1,7 @@<br>
#ifndef _UTIL_H<br>
#define _UTIL_H<br>
<br>
-void strchop(char *);<br>
+size_t strchop(char *);<br>
int basenamecpy (const char * src, char * dst, int);<br>
int filepresent (char * run);<br>
int get_word (char * sentence, char ** word);<br>
--<br>
1.8.1.4<br>
<br>
</div></div>--<br>
dm-devel mailing list<br>
<a href="mailto:dm-devel@redhat.com">dm-devel@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/dm-devel" target="_blank">https://www.redhat.com/mailman/listinfo/dm-devel</a><br>
</blockquote></div><br></div>