]> Git Repo - linux.git/commitdiff
staging: rtl8192u: use %*pEn to escape buffer
authorAndy Shevchenko <[email protected]>
Mon, 13 Oct 2014 22:55:33 +0000 (15:55 -0700)
committerLinus Torvalds <[email protected]>
Tue, 14 Oct 2014 00:18:27 +0000 (02:18 +0200)
Let's use kernel's native specifier to escape a buffer.

Signed-off-by: Andy Shevchenko <[email protected]>
Cc: "John W . Linville" <[email protected]>
Cc: Johannes Berg <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Joe Perches <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
drivers/staging/rtl8192u/ieee80211/ieee80211.h

index 9ecfa4a2421d7b5b815d114e0d551615ce9de0e5..b44aa17d30a764f429fad303d9c562d97975b8d4 100644 (file)
@@ -2593,25 +2593,13 @@ static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
 
 static inline const char *escape_essid(const char *essid, u8 essid_len) {
        static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
-       const char *s = essid;
-       char *d = escaped;
 
        if (ieee80211_is_empty_essid(essid, essid_len)) {
                memcpy(escaped, "<hidden>", sizeof("<hidden>"));
                return escaped;
        }
 
-       essid_len = min(essid_len, (u8)IW_ESSID_MAX_SIZE);
-       while (essid_len--) {
-               if (*s == '\0') {
-                       *d++ = '\\';
-                       *d++ = '0';
-                       s++;
-               } else {
-                       *d++ = *s++;
-               }
-       }
-       *d = '\0';
+       snprintf(escaped, sizeof(escaped), "%*pEn", essid_len, essid);
        return escaped;
 }
 
This page took 0.057314 seconds and 4 git commands to generate.