diff mbox series

[pacman-dev] Split target output

Message ID 20200417222259.3741005-2-uhhadd@gmail.com
State Superseded, archived
Headers show
Series [pacman-dev] Split target output | expand

Commit Message

Carson Black April 17, 2020, 10:22 p.m. UTC 
This patch splits the monolithic 'Packages (count):' output on transactions into
multiple package outputs per category of action: 'Installing (count):', 'Upgrading
(count):', and 'Removing (count):'.

Signed-off-by: Carson Black <uhhadd@gmail.com>
---
 src/pacman/util.c | 80 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 14 deletions(-)

Comments

Eli Schwartz April 17, 2020, 10:34 p.m. UTC | #1 
On 4/17/20 6:22 PM, Carson Black wrote:
> This patch splits the monolithic 'Packages (count):' output on transactions into
> multiple package outputs per category of action: 'Installing (count):', 'Upgrading
> (count):', and 'Removing (count):'.
> 
> Signed-off-by: Carson Black <uhhadd@gmail.com>

This builds with warnings, which means that development builds including
-Werror will fail.

[1/4] Compiling C object 'pacman@exe/src_pacman_util.c.o'
FAILED: pacman@exe/src_pacman_util.c.o
ccache cc -Ipacman@exe -I. -I.. -Isrc/common -I../src/common
-Ilib/libalpm -I../lib/libalpm -fdiagnostics-color=always -pipe
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Werror -std=gnu99 -g
-Wcast-align -Wclobbered -Wempty-body -Wfloat-equal -Wformat-nonliteral
-Wformat-security -Wignored-qualifiers -Wimplicit-fallthrough
-Winit-self -Wlogical-op -Wmissing-declarations
-Wmissing-field-initializers -Wmissing-parameter-type
-Wmissing-prototypes -Wold-style-declaration -Woverride-init
-Wpointer-arith -Wredundant-decls -Wshadow -Wsign-compare
-Wstrict-aliasing -Wstrict-overflow=5 -Wstrict-prototypes -Wtype-limits
-Wuninitialized -Wunused-but-set-parameter -Wunused-parameter
-Wwrite-strings -include config.h -MD -MQ
'pacman@exe/src_pacman_util.c.o' -MF 'pacman@exe/src_pacman_util.c.o.d'
-o 'pacman@exe/src_pacman_util.c.o' -c ../src/pacman/util.c
../src/pacman/util.c: In function ‘_display_targets’:
../src/pacman/util.c:901:25: error: initialization discards ‘const’
qualifier from pointer target type [-Werror=discarded-qualifiers]
  901 |  char *install_header = "";
      |                         ^~
../src/pacman/util.c:902:25: error: initialization discards ‘const’
qualifier from pointer target type [-Werror=discarded-qualifiers]
  902 |  char *upgrade_header = "";
      |                         ^~
../src/pacman/util.c:903:24: error: initialization discards ‘const’
qualifier from pointer target type [-Werror=discarded-qualifiers]
  903 |  char *remove_header = "";
      |                        ^~
../src/pacman/util.c:943:16: error: unused variable ‘target_name’
[-Werror=unused-variable]
  943 |    const char* target_name = alpm_pkg_get_name(target->remove);
      |                ^~~~~~~~~~~
../src/pacman/util.c:1010:21: error: comparison with string literal
results in unspecified behavior [-Werror=address]
 1010 |  if (install_header != "") free(install_header);
      |                     ^~
../src/pacman/util.c:1011:21: error: comparison with string literal
results in unspecified behavior [-Werror=address]
 1011 |  if (upgrade_header != "") free(upgrade_header);
      |                     ^~
../src/pacman/util.c:1012:20: error: comparison with string literal
results in unspecified behavior [-Werror=address]
 1012 |  if (remove_header != "") free(remove_header);
      |                    ^~
cc1: all warnings being treated as errors
Carson Black April 17, 2020, 10:57 p.m. UTC | #2 
Thanks for pointing that out; addressed compiler warnings.
Allan McRae April 18, 2020, 1:34 a.m. UTC | #3 
On 18/4/20 8:57 am, Carson Black wrote:
> Thanks for pointing that out; addressed compiler warnings.
> 

Please don't use a cover letter email.   Just edit the patch and put
comments under the "---" line.

Also, adjust the subject to include "v2" for revised patches.

Allan
Carson Black April 18, 2020, 1:36 a.m. UTC | #4 
Sorry, my bad. Still not the most used to submitting patches with git
send-email.

WIll do.

-- Carson Black [ jan Pontaoski ]

Am Fr., 17. Apr. 2020 um 21:34 Uhr schrieb Allan McRae <allan@archlinux.org>:
>
> On 18/4/20 8:57 am, Carson Black wrote:
> > Thanks for pointing that out; addressed compiler warnings.
> >
>
> Please don't use a cover letter email.   Just edit the patch and put
> comments under the "---" line.
>
> Also, adjust the subject to include "v2" for revised patches.
>
> Allan
diff mbox series

Patch

diff --git a/src/pacman/util.c b/src/pacman/util.c
index 6693ec75..2fd8688f 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -898,7 +898,10 @@  static void _display_targets(alpm_list_t *targets, int verbose)
 	char *str;
 	off_t isize = 0, rsize = 0, dlsize = 0;
 	unsigned short cols;
-	alpm_list_t *i, *names = NULL, *header = NULL, *rows = NULL;
+	char *install_header = "";
+	char *upgrade_header = "";
+	char *remove_header = "";
+	alpm_list_t *i, *install = NULL, *upgrade = NULL, *remove = NULL, *header = NULL, *rows = NULL;
 
 	if(!targets) {
 		return;
@@ -918,6 +921,10 @@  static void _display_targets(alpm_list_t *targets, int verbose)
 		}
 	}
 
+	uint install_targets = 0;
+	uint upgrade_targets = 0;
+	uint remove_targets = 0;
+
 	/* form data for both verbose and non-verbose display */
 	for(i = targets; i; i = alpm_list_next(i)) {
 		pm_target_t *target = i->data;
@@ -926,38 +933,83 @@  static void _display_targets(alpm_list_t *targets, int verbose)
 			rows = alpm_list_add(rows, create_verbose_row(target));
 		}
 
-		if(target->install) {
+		if(target->install && target->remove) {
 			pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->install), config->colstr.faint,
-					alpm_pkg_get_version(target->install), config->colstr.nocolor);
-		} else if(isize == 0) {
-			pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->remove), config->colstr.faint,
-					alpm_pkg_get_version(target->remove), config->colstr.nocolor);
+								alpm_pkg_get_version(target->install), config->colstr.nocolor);
+		} else if(target->install) {
+			pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->install), config->colstr.faint,
+								alpm_pkg_get_version(target->install), config->colstr.nocolor);
 		} else {
-			pm_asprintf(&str, "%s%s-%s %s[%s]%s", alpm_pkg_get_name(target->remove), config->colstr.faint,
-					alpm_pkg_get_version(target->remove), config->colstr.nocolor, _("removal"), config->colstr.nocolor);
+			const char* target_name = alpm_pkg_get_name(target->remove);
+			pm_asprintf(&str, "%s%s-%s%s", alpm_pkg_get_name(target->remove), config->colstr.faint,
+								alpm_pkg_get_version(target->remove), config->colstr.nocolor);
+		}
+
+		if (target->install && target->remove) {
+			upgrade = alpm_list_add(upgrade, str);
+			upgrade_targets++;
+		} else if (target->install) {
+			install = alpm_list_add(install, str);
+			install_targets++;
+		} else if (target->remove) {
+			remove = alpm_list_add(remove, str);
+			remove_targets++;
 		}
-		names = alpm_list_add(names, str);
 	}
 
 	/* print to screen */
-	pm_asprintf(&str, "%s (%zu)", _("Packages"), alpm_list_count(targets));
-	printf("\n");
+	if (install_targets) {
+		pm_asprintf(&install_header, _("Installing (%u):"), install_targets);
+	}
+	if (remove_targets) {
+		pm_asprintf(&remove_header, _("Removing (%u):"), remove_targets);
+	}
+	if (upgrade_targets) {
+		pm_asprintf(&upgrade_header, _("Upgrading (%u):"), upgrade_targets);
+	}
 
 	cols = getcols();
 	if(verbose) {
 		header = create_verbose_header(alpm_list_count(targets));
 		if(table_display(header, rows, cols) != 0) {
 			/* fallback to list display if table wouldn't fit */
-			list_display(str, names, cols);
+			if (install_targets) {
+				list_display(install_header, install, cols);
+			}
+			if (upgrade_targets) {
+				list_display(upgrade_header, upgrade, cols);
+			}
+			if (remove_targets) {
+				list_display(remove_header, remove, cols);
+			}
 		}
 	} else {
-		list_display(str, names, cols);
+		if (install_targets) {
+			list_display(install_header, install, cols);
+			if (upgrade_targets || remove_targets) {
+				printf("\n");
+			}
+		}
+		if (upgrade_targets) {
+			list_display(upgrade_header, upgrade, cols);
+			if (remove_targets) {
+				printf("\n");
+			}
+		}
+		if (remove_targets) {
+			list_display(remove_header, remove, cols);
+		}
 	}
 	printf("\n");
 
 	table_free(header, rows);
-	FREELIST(names);
+	if (install) alpm_list_free(install);
+	if (upgrade) alpm_list_free(upgrade);
+	if (remove) alpm_list_free(remove);
 	free(str);
+	if (install_header != "") free(install_header);
+	if (upgrade_header != "") free(upgrade_header);
+	if (remove_header != "") free(remove_header);
 	rows = NULL;
 
 	if(dlsize > 0 || config->op_s_downloadonly) {