lib80211: remove unused print_ssid()

In kernel we have %*pE specifier to print an escaped buffer.  All users
now switched to that approach.

This fixes a bug as well.  The current implementation wrongly prints
octal numbers: only two first digits are used in case when 3 are
required and the rest of the string ends up cut off.

Additionally by default the \f, \v, \a, and \e are escaped to their
alphabetic representation.  It's safe to do since it is currently used
for messaging only.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "John W . Linville" <linville@tuxdriver.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index be95b9262801880f7a835f7954f14c1f0c1e2397..aab0f427edb58d59a868595bf6e5238a2546f43d 100644 (file)
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -32,11 +32,6 @@
 #include <linux/timer.h>
 #include <linux/seq_file.h>
 
-/* print_ssid() is intended to be used in debug (and possibly error)
- * messages. It should never be used for passing ssid to user space. */
-const char *print_ssid(char *buf, const char *ssid, u8 ssid_len);
-#define DECLARE_SSID_BUF(var) char var[IEEE80211_MAX_SSID_LEN * 4 + 1] __maybe_unused
-
 #define NUM_WEP_KEYS   4
 
 enum {

diff --git a/net/wireless/lib80211.c b/net/wireless/lib80211.c
index a55c27b75ee5667a7046ad54855f8ddd90c57b05..459611577d3dfa29f72442dfe1dcdfe4f2c6a502 100644 (file)
--- a/net/wireless/lib80211.c
+++ b/net/wireless/lib80211.c
@@ -46,38 +46,6 @@ static void lib80211_crypt_deinit_entries(struct lib80211_crypt_info *info,
 static void lib80211_crypt_quiescing(struct lib80211_crypt_info *info);
 static void lib80211_crypt_deinit_handler(unsigned long data);
 
-const char *print_ssid(char *buf, const char *ssid, u8 ssid_len)
-{
-       const char *s = ssid;
-       char *d = buf;
-
-       ssid_len = min_t(u8, ssid_len, IEEE80211_MAX_SSID_LEN);
-       while (ssid_len--) {
-               if (isprint(*s)) {
-                       *d++ = *s++;
-                       continue;
-               }
-
-               *d++ = '\\';
-               if (*s == '\0')
-                       *d++ = '0';
-               else if (*s == '\n')
-                       *d++ = 'n';
-               else if (*s == '\r')
-                       *d++ = 'r';
-               else if (*s == '\t')
-                       *d++ = 't';
-               else if (*s == '\\')
-                       *d++ = '\\';
-               else
-                       d += snprintf(d, 3, "%03o", *s);
-               s++;
-       }
-       *d = '\0';
-       return buf;
-}
-EXPORT_SYMBOL(print_ssid);
-
 int lib80211_crypt_info_init(struct lib80211_crypt_info *info, char *name,
                                spinlock_t *lock)
 {