The patch titled Subject: staging: rtl8192e: use %*pEn to escape buffer has been added to the -mm tree. Its filename is staging-rtl8192e-use-%pen-to-escape-buffer.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/staging-rtl8192e-use-%pen-to-escape-buffer.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/staging-rtl8192e-use-%pen-to-escape-buffer.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Subject: staging: rtl8192e: use %*pEn to escape buffer Let's use kernel's native specifier to escape a buffer. Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Cc: "John W . Linville" <linville@xxxxxxxxxxxxx> Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/staging/rtl8192e/rtllib.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff -puN drivers/staging/rtl8192e/rtllib.h~staging-rtl8192e-use-%pen-to-escape-buffer drivers/staging/rtl8192e/rtllib.h --- a/drivers/staging/rtl8192e/rtllib.h~staging-rtl8192e-use-%pen-to-escape-buffer +++ a/drivers/staging/rtl8192e/rtllib.h @@ -2956,25 +2956,13 @@ extern inline int rtllib_get_scans(struc 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 (rtllib_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; } _ Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are lib-string_helpers-move-documentation-to-c-file.patch lib-string_helpers-refactoring-the-test-suite.patch lib-string_helpers-introduce-string_escape_mem.patch lib-vsprintf-add-%pe-format-specifier.patch lib-vsprintf-add-%pe-format-specifier-fix.patch wireless-libertas-print-esaped-string-via-%pe.patch wireless-ipw2x00-print-ssid-via-%pe.patch wireless-hostap-proc-print-properly-escaped-ssid.patch lib80211-remove-unused-print_ssid.patch staging-wlan-ng-use-%pehp-to-print-sn.patch staging-rtl8192e-use-%pen-to-escape-buffer.patch staging-rtl8192u-use-%pen-to-escape-buffer.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html