Rename pkg_name variables to pkgname

This will avoid a name clash with the upcoming function of the same
name.

src/divertcmd.c

@@ -575,17 +575,17 @@ diversion_list(const char *const *argv)
 		struct glob_node *g;
 		struct diversion *contest = namenode->divert;
 		struct diversion *altname;
-		const char *pkg_name;
+		const char *pkgname;
 
 		if (contest->useinstead == NULL)
 			continue;
 
 		altname = contest->useinstead->divert;
 
-		pkg_name = diversion_pkg_name(contest);
+		pkgname = diversion_pkg_name(contest);
 
 		for (g = glob_list; g; g = g->next) {
-			if (fnmatch(g->pattern, pkg_name, 0) == 0 ||
+			if (fnmatch(g->pattern, pkgname, 0) == 0 ||
 			    fnmatch(g->pattern, contest->useinstead->name, 0) == 0 ||
 			    fnmatch(g->pattern, altname->camefrom->name, 0) == 0) {
 				printf("%s\n", diversion_describe(contest));

src/querycmd.c

@@ -562,11 +562,11 @@ static int
 control_path(const char *const *argv)
 {
   struct pkginfo *pkg;
-  const char *pkg_name;
+  const char *pkgname;
   const char *control_file;
 
-  pkg_name = *argv++;
-  if (!pkg_name)
+  pkgname = *argv++;
+  if (!pkgname)
     badusage(_("--%s needs at least one package name argument"),
              cipaction->olong);
 
@@ -585,7 +585,7 @@ control_path(const char *const *argv)
 
   modstatdb_open(msdbrw_readonly);
 
-  pkg = pkg_db_find(pkg_name);
+  pkg = pkg_db_find(pkgname);
   if (pkg->status == stat_notinstalled)
     ohshit(_("Package `%s' is not installed.\n"), pkg->set->name);