[B.A.T.M.A.N.] [PATCH 1/2] alfred: Fix typo Retreive -> Retrieve

[B.A.T.M.A.N.] [PATCH 1/2] alfred: Fix typo Retreive -> Retrieve

[Sven Eckelmann]

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 man/alfred.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/alfred.8 b/man/alfred.8
index 95241a7..49d42bc 100644
--- a/man/alfred.8
+++ b/man/alfred.8
@@ -130,7 +130,7 @@ Send data to the alfred server and store it under id 65:
 .br
 \fB     cat /etc/hostname | alfred -s 65\fP
 
-Retreive all data stored as id 65 from all connected alfred servers:
+Retrieve all data stored as id 65 from all connected alfred servers:
 .br
 \fB     alfred -r 65\fP
 .nf
-- 
2.6.4

[B.A.T.M.A.N.] [PATCH 2/2] alfred: Remove bogus length check in debugfs_make_path

[Sven Eckelmann]

The length check never used the mesh_iface length in the size calculation.
Instead it used the length of the mountpoint and the format string. But the
length of the format string is not the length of the final string.

Instead remove this check and depend completely on the return value of
snprintf.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 debugfs.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/debugfs.c b/debugfs.c
index 6404b49..fc39322 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -46,19 +46,12 @@ static const char *debugfs_known_mountpoints[] = {
 int debugfs_make_path(const char *fmt, const char *mesh_iface, char *buffer,
 		      int size)
 {
-	int len;
-
 	if (strlen(debugfs_mountpoint) == 0) {
 		buffer[0] = '\0';
 		return -1;
 	}
 
-	len = strlen(debugfs_mountpoint) + strlen(fmt) + 1;
-	if (len >= size)
-		return len+1;
-
-	snprintf(buffer, size-1, fmt, debugfs_mountpoint, mesh_iface);
-	return 0;
+	return snprintf(buffer, size, fmt, debugfs_mountpoint, mesh_iface);
 }
 
 static int debugfs_found;
-- 
2.6.4

Re: [B.A.T.M.A.N.] [PATCH 2/2] alfred: Remove bogus length check in debugfs_make_path

[Simon Wunderlich]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

On Monday 14 December 2015 15:00:27 Sven Eckelmann wrote:
> The length check never used the mesh_iface length in the size calculation.
> Instead it used the length of the mountpoint and the format string. But the
> length of the format string is not the length of the final string.
> 
> Instead remove this check and depend completely on the return value of
> snprintf.
> 
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Applied in revision bcd33e6.

Thanks!
    Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [B.A.T.M.A.N.] [PATCH 1/2] alfred: Fix typo Retreive -> Retrieve

[Simon Wunderlich]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

On Monday 14 December 2015 15:00:26 Sven Eckelmann wrote:
> Signed-off-by: Sven Eckelmann <sven@narfation.org>

Applied in revision ebf327b.

Thanks!
    Simon

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 181 bytes --]