Thread (8 messages) 8 messages, 2 authors, 2009-02-16

[PATCH 6/6] Make expand_name a void function

flat view
STALE6456d

From: Gustavo F. Padovan <hidden>
Date: 2009-02-15 19:47:26
Subsystem: the rest · Maintainer: Linus Torvalds

---
 src/main.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index c86ae96..5ca1b27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -266,13 +266,13 @@ static void update_service_classes(const bdaddr_t *bdaddr, uint8_t value)
  * Device name expansion
  *   %d - device id
  */
-static char *expand_name(char *dst, int size, char *str, int dev_id)
+static void expand_name(char *dst, int size, char *str, int dev_id)
 {
 	register int sp, np, olen;
 	char *opt, buf[10];
 
 	if (!str && !dst)
-		return NULL;
+		return;
 
 	sp = np = 0;
 	while (np < size - 1 && str[sp]) {
@@ -317,7 +317,6 @@ static char *expand_name(char *dst, int size, char *str, int dev_id)
 		}
 	}
 	dst[np] = '\0';
-	return dst;
 }
 
 static gboolean child_exit(GIOChannel *io, GIOCondition cond, void *user_data)
-- 
1.6.0.6
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help