Commit Diff

Commit:
50f6148a8cb54672795a89ce089488e86f584a0e
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
gotwebd: fix some got_error_from_errno2/3 calls it's not printf-like so %s don't make sense. Tweak the order of the arguments to obtain the intended output.
Actions:
Patch | Tree
commit - ea2819beec950c5a86b5960f5966115816997164
commit + 50f6148a8cb54672795a89ce089488e86f584a0e
blob - d5a00b94081cc1867b1806eab44247435884f343
blob + 3e66b1cc2a7cd11d9c5f6e4d07a2826a420824e2
--- gotwebd/got_operations.c
+++ gotwebd/got_operations.c
@@ -1267,7 +1267,7 @@ got_init_repo_commit(struct repo_commit **rc)
 {
 	*rc = calloc(1, sizeof(**rc));
 	if (*rc == NULL)
-		return got_error_from_errno2("%s: calloc", __func__);
+		return got_error_from_errno2(__func__, "calloc");
 
 	(*rc)->path = NULL;
 	(*rc)->refs_str = NULL;
@@ -1286,7 +1286,7 @@ got_init_repo_tag(struct repo_tag **rt)
 {
 	*rt = calloc(1, sizeof(**rt));
 	if (*rt == NULL)
-		return got_error_from_errno2("%s: calloc", __func__);
+		return got_error_from_errno2(__func__, "calloc");
 
 	(*rt)->commit_id = NULL;
 	(*rt)->tag_name = NULL;
blob - 12fe22174e6a7a68f8f0cfbe191689fa49c0de9a
blob + 983fb20185d96176ed732dfe115d8e8dd355b575
--- gotwebd/gotweb.c
+++ gotwebd/gotweb.c
@@ -418,7 +418,7 @@ gotweb_init_transport(struct transport **t)
 
 	*t = calloc(1, sizeof(**t));
 	if (*t == NULL)
-		return got_error_from_errno2("%s: calloc", __func__);
+		return got_error_from_errno2(__func__, "calloc");
 
 	TAILQ_INIT(&(*t)->repo_commits);
 	TAILQ_INIT(&(*t)->repo_tags);
@@ -436,13 +436,13 @@ gotweb_init_querystring(struct querystring **qs)
 
 	*qs = calloc(1, sizeof(**qs));
 	if (*qs == NULL)
-		return got_error_from_errno2("%s: calloc", __func__);
+		return got_error_from_errno2(__func__, "calloc");
 
 	(*qs)->headref = strdup("HEAD");
 	if ((*qs)->headref == NULL) {
 		free(*qs);
 		*qs = NULL;
-		return got_error_from_errno2("%s: strdup", __func__);
+		return got_error_from_errno2(__func__, "strdup");
 	}
 
 	(*qs)->action = INDEX;
@@ -467,7 +467,7 @@ gotweb_parse_querystring(struct querystring **qs, char
 
 	tok1 = strdup(qst);
 	if (tok1 == NULL)
-		return got_error_from_errno2("%s: strdup", __func__);
+		return got_error_from_errno2(__func__, "strdup");
 
 	tok1_pair = tok1;
 	tok1_end = tok1;
@@ -478,7 +478,7 @@ gotweb_parse_querystring(struct querystring **qs, char
 		tok2 = strdup(tok1_pair);
 		if (tok2 == NULL) {
 			free(tok1);
-			return got_error_from_errno2("%s: strdup", __func__);
+			return got_error_from_errno2(__func__, "strdup");
 		}
 
 		tok2_pair = tok2;
@@ -583,24 +583,24 @@ qa_found:
 		case COMMIT:
 			(*qs)->commit = strdup(value);
 			if ((*qs)->commit == NULL) {
-				error = got_error_from_errno2("%s: strdup",
-				    __func__);
+				error = got_error_from_errno2(__func__,
+				    "strdup");
 				goto done;
 			}
 			break;
 		case RFILE:
 			(*qs)->file = strdup(value);
 			if ((*qs)->file == NULL) {
-				error = got_error_from_errno2("%s: strdup",
-				    __func__);
+				error = got_error_from_errno2(__func__,
+				    "strdup");
 				goto done;
 			}
 			break;
 		case FOLDER:
 			(*qs)->folder = strdup(value);
 			if ((*qs)->folder == NULL) {
-				error = got_error_from_errno2("%s: strdup",
-				    __func__);
+				error = got_error_from_errno2(__func__,
+				    "strdup");
 				goto done;
 			}
 			break;
@@ -608,8 +608,8 @@ qa_found:
 			free((*qs)->headref);
 			(*qs)->headref = strdup(value);
 			if ((*qs)->headref == NULL) {
-				error = got_error_from_errno2("%s: strdup",
-				    __func__);
+				error = got_error_from_errno2(__func__,
+				    "strdup");
 				goto done;
 			}
 			break;
@@ -619,8 +619,8 @@ qa_found:
 			(*qs)->index_page = strtonum(value, INT64_MIN,
 			    INT64_MAX, &errstr);
 			if (errstr) {
-				error = got_error_from_errno3("%s: strtonum %s",
-				    __func__, errstr);
+				error = got_error_from_errno3(__func__,
+				    "strtonum", errstr);
 				goto done;
 			}
 			if ((*qs)->index_page < 0)
@@ -629,8 +629,8 @@ qa_found:
 		case PATH:
 			(*qs)->path = strdup(value);
 			if ((*qs)->path == NULL) {
-				error = got_error_from_errno2("%s: strdup",
-				    __func__);
+				error = got_error_from_errno2(__func__,
+				    "strdup");
 				goto done;
 			}
 			break;
@@ -640,8 +640,8 @@ qa_found:
 			(*qs)->page = strtonum(value, INT64_MIN,
 			    INT64_MAX, &errstr);
 			if (errstr) {
-				error = got_error_from_errno3("%s: strtonum %s",
-				    __func__, errstr);
+				error = got_error_from_errno3(__func__,
+				    "strtonum", errstr);
 				goto done;
 			}
 			if ((*qs)->page < 0)