cli: 'dev wifi list' use nm_utils_ssid_to_utf8() to display SSID; add SSID-HEX

This commit removes enclosing '' from SSID.
SSID-HEX is printed as a string of hex characters (each 2 chars represent one
byte).
This commit is contained in:
Jiří Klimeš
2013-05-16 16:26:15 +02:00
parent 66098fa607
commit 28704d1f42
4 changed files with 35 additions and 35 deletions

View File

@@ -147,13 +147,11 @@ nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***argv, GErr
}
/*
* Convert SSID to a printable form.
* If it is an UTF-8 string, enclose it in quotes and return it.
* Otherwise convert it to a hex string representation.
* Convert SSID to a hex string representation.
* Caller has to free the returned string using g_free()
*/
char *
ssid_to_printable (const char *str, gsize len)
ssid_to_hex (const char *str, gsize len)
{
GString *printable;
char *printable_str;
@@ -162,9 +160,6 @@ ssid_to_printable (const char *str, gsize len)
if (str == NULL || len == 0)
return NULL;
if (g_utf8_validate (str, len, NULL))
return g_strdup_printf ("'%.*s'", (int) len, str);
printable = g_string_new (NULL);
for (i = 0; i < len; i++) {
g_string_append_printf (printable, "%02X", (unsigned char) str[i]);