Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Use the new %N pkg_printf() format.
Matthew Seaman committed 12 years ago
commit e5ff66bb58ad9e74a21f1dac2b9691484e23eb66
parent bfba1d1
1 file changed +2 -6
modified pkg/query.c
@@ -2,6 +2,7 @@
 * Copyright (c) 2011-2012 Baptiste Daroussin <bapt@FreeBSD.org>
 * Copyright (c) 2011-2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
 * Copyright (c) 2012 Bryan Drewery <bryan@shatow.net>
+
 * Copyright (c) 2013 Matthew Seaman <matthew@FreeBSD.org>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -76,7 +77,6 @@ static struct query_flags accepted_query_flags[] = {
static void
format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
{
-
	const char *tmp;

	sbuf_clear(dest);

@@ -94,11 +94,7 @@ format_str(struct pkg *pkg, struct sbuf *dest, const char *qstr, void *data)
				pkg_sbuf_printf(dest, "%o", pkg);
				break;
			case 'R':
-
				/* @@@@@@@@@@
-
				   pkg_sbuf_printf(dest, "%...", pkg); */ 
-
				pkg_get(pkg, PKG_REPONAME, &tmp);
-
				if (tmp != NULL)
-
					sbuf_cat(dest, tmp);
+
				pkg_sbuf_printf(dest, "%N", pkg);
				break;
			case 'p':
				pkg_sbuf_printf(dest, "%p", pkg);