diff --git a/cli/src/utils.c b/cli/src/utils.c index 81e7e66df..087a98485 100644 --- a/cli/src/utils.c +++ b/cli/src/utils.c @@ -278,83 +278,3 @@ print_fields (const NmcPrintFields fields, const NmcOutputField field_values[]) g_string_free (str, TRUE); } - -/*--- obsolete printing functions ---*/ -void -print_table_header (const char *name, ...) -{ - va_list ap; - GString *str; - char *col, *line = NULL; - int col_width, width1, width2, table_width = 0; - - str = g_string_new (NULL); - - va_start (ap, name); - while ((col = va_arg (ap, char *)) != NULL) { - col_width = va_arg (ap, int); - width1 = strlen (col); - width2 = g_utf8_strlen (col, -1); /* Width of the string (in screen colums) */ - g_string_append_printf (str, "%-*s", col_width + width1 - width2, col); - g_string_append_c (str, ' '); /* Column separator */ - table_width += col_width + width1 - width2 + 1; - } - va_end (ap); - - if (table_width <= 0) - table_width = g_utf8_strlen (name, -1) + 4; - - /* Print the table header */ - line = g_strnfill (table_width, '='); - printf ("%s\n", line); - width1 = strlen (name); - width2 = g_utf8_strlen (name, -1); - printf ("%*s\n", (table_width + width2)/2 + width1 - width2, name); - printf ("%s\n", line); - if (str->len > 0) { - g_string_truncate (str, str->len-1); /* Chop off last column separator */ - printf ("%s\n", str->str); - g_free (line); - line = g_strnfill (table_width, '-'); - printf ("%s\n", line); - } - - g_free (line); - g_string_free (str, TRUE); -} - -void -print_table_line (int indent, ...) -{ - va_list ap; - GString *str; - char *col, *indent_str; - int col_width, width1, width2; - - str = g_string_new (NULL); - - va_start (ap, indent); - while ((col = va_arg (ap, char *)) != NULL) { - col_width = va_arg (ap, int); - width1 = strlen (col); - width2 = g_utf8_strlen (col, -1); /* Width of the string (in screen colums) */ - g_string_append_printf (str, "%-*s", col_width + width1 - width2, col); - g_string_append_c (str, ' '); /* Column separator */ - } - va_end (ap); - - /* Print the line */ - if (str->len > 0) - { - g_string_truncate (str, str->len-1); /* Chop off last column separator */ - if (indent > 0) { - indent_str = g_strnfill (indent, ' '); - g_string_prepend (str, indent_str); - g_free (indent_str); - } - printf ("%s\n", str->str); - } - - g_string_free (str, TRUE); -} - diff --git a/cli/src/utils.h b/cli/src/utils.h index 5264feb71..e12dae85d 100644 --- a/cli/src/utils.h +++ b/cli/src/utils.h @@ -31,7 +31,5 @@ char *ssid_to_printable (const char *str, gsize len); GArray *parse_output_fields (const char *fields_str, const NmcOutputField fields_array[], GError **error); gboolean nmc_terse_option_check (NMCPrintOutput print_output, const char *fields, GError **error); void print_fields (const NmcPrintFields fields, const NmcOutputField field_values[]); -void print_table_header (const char *name, ...); -void print_table_line (int indent, ...); #endif /* NMC_UTILS_H */