linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "John W . Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes@sipsolutions.net>,
	devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Joe Perches <joe@perches.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 08/11] lib80211: remove unused print_ssid()
Date: Wed, 20 Aug 2014 12:42:49 +0300	[thread overview]
Message-ID: <1408527772-27224-9-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1408527772-27224-1-git-send-email-andriy.shevchenko@linux.intel.com>

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>
---
 include/net/lib80211.h  |  5 -----
 net/wireless/lib80211.c | 32 --------------------------------
 2 files changed, 37 deletions(-)

diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index be95b92..aab0f42 100644
--- 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 a55c27b..4596115 100644
--- 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)
 {
-- 
2.1.0


  parent reply	other threads:[~2014-08-20  9:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20  9:42 [PATCH v3 00/11] lib: introduce string_escape_mem and %*pE specifier Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 01/11] lib / string_helpers: move documentation to c-file Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 02/11] lib / string_helpers: refactoring the test suite Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 03/11] lib / string_helpers: introduce string_escape_mem() Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 04/11] lib/vsprintf: add %*pE[achnops] format specifier Andy Shevchenko
2014-08-20 14:46   ` Joe Perches
2014-08-25  8:15     ` Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 05/11] wireless: libertas: print esaped string via %*pE Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 06/11] wireless: ipw2x00: print SSID " Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 07/11] wireless: hostap: proc: print properly escaped SSID Andy Shevchenko
2014-09-01  7:16   ` Andy Shevchenko
2014-08-20  9:42 ` Andy Shevchenko [this message]
2014-08-20  9:42 ` [PATCH v3 09/11] staging: wlan-ng: use %*pEhp to print SN Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 10/11] staging: rtl8192e: use %*pEn to escape buffer Andy Shevchenko
2014-08-20  9:42 ` [PATCH v3 11/11] staging: rtl8192u: " Andy Shevchenko
2014-08-28 18:33 ` [PATCH v3 00/11] lib: introduce string_escape_mem and %*pE specifier John W. Linville
2014-08-28 19:08   ` Andrew Morton
2014-08-28 19:16     ` John W. Linville
2014-08-28 20:58     ` Andy Shevchenko
2014-08-28 21:06       ` Andrew Morton
2014-08-28 21:08         ` Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1408527772-27224-9-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).