Mercurial > blahgd > fmt4

changeset 1101:6bfdf28a2f5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
req: use 'admin' directly from the query nvlist Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Thu, 07 Sep 2017 17:38:02 +0300
parents 690246b04ebe
children 8e77b198735d
files req.c req.h
diffstat 2 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/req.c	Thu Sep 07 17:37:00 2017 +0300
+++ b/req.c	Thu Sep 07 17:38:02 2017 +0300
@@ -251,7 +251,6 @@
 	struct str *uri;
 
 	args->page = PAGE_INDEX;
-	args->admin = 0;
 	args->cat = NULL;
 	args->tag = NULL;
 	args->feed = NULL;
@@ -275,9 +274,7 @@
 	nvl_for_each(cur, query) {
 		const char *name, *val;
 		const char **cptr;
-		int *iptr;
 
-		iptr = NULL;
 		cptr = NULL;
 
 		name = nvpair_name(cur);
@@ -300,14 +297,12 @@
 		} else if (!strcmp(name, "preview")) {
 			continue;
 		} else if (!strcmp(name, "admin")) {
-			iptr = &args->admin;
+			continue;
 		} else {
 			return false;
 		}
 
-		if (iptr)
-			*iptr = atoi(val);
-		else if (cptr)
+		if (cptr)
 			*cptr = val;
 	}
 
@@ -323,7 +318,7 @@
 		args->page = PAGE_ARCHIVE;
 	else if (nvl_exists(query, "p"))
 		args->page = PAGE_STORY;
-	else if (args->admin)
+	else if (nvl_exists(query, "admin"))
 		args->page = PAGE_ADMIN;
 
 	return true;
--- a/req.h	Thu Sep 07 17:37:00 2017 +0300
+++ b/req.h	Thu Sep 07 17:38:02 2017 +0300
@@ -44,7 +44,6 @@
 struct qs {
 	int page;
 
-	int admin;
 	const char *cat;
 	const char *tag;
 	const char *feed;