commit f9ba221e8cb752b2dc0bdefd29108cff8ab31799
from: Omar Polo <op@omarpolo.com>
date: Mon May 15 18:43:38 2023 UTC

simplify previous; avoid temporary string

blind ok stsp@

commit - 689555c9e29b71a739b43324c7639a4803744bdf
commit + f9ba221e8cb752b2dc0bdefd29108cff8ab31799
blob - 75069adb84eda8f619f64c4e361a4cebd5c853dd
blob + 25bddbc9c0a8c95dc7b5008c82de519be7d36960
--- tog/tog.c
+++ tog/tog.c
@@ -2496,36 +2496,30 @@ draw_commit(struct tog_view *view, struct got_commit_o
 	/* Prepend reference labels to log message if possible .*/
 	refs = got_reflist_object_id_map_lookup(tog_refs_idmap, id);
 	if (refs) {
-		char *refs_str, *p, *newlogmsg;
+		char *refs_str, *newlogmsg;
 		wchar_t *ws;
 
 		err = build_refs_str(&refs_str, refs, id, s->repo);
 		if (err)
 			goto done;
-
-		if (asprintf(&p, "[%s]", refs_str) == -1) {
-			err = got_error_from_errno("asprintf");
-			free(refs_str);
-			goto done;
-		}
-		free(refs_str);
-		refs_str = NULL;
 	
 		/*
 		 * The length of this wide-char sub-string will be
 		 * needed later for colorization.
 		 */
-		err = mbs2ws(&ws, &wrefstr_len, p);
+		err = mbs2ws(&ws, &wrefstr_len, refs_str);
 		if (err)
 			goto done;
 		free(ws);
 
-		if (asprintf(&newlogmsg, "%s %s", p, logmsg) == -1) {
+		wrefstr_len += 2; /* account for '[' and ']' */
+
+		if (asprintf(&newlogmsg, "[%s] %s", refs_str, logmsg) == -1) {
 			err = got_error_from_errno("asprintf");
-			free(p);
+			free(refs_str);
 			goto done;
 		}
-		free(p);
+		free(refs_str);
 
 		free(logmsg0);
 		logmsg0 = newlogmsg;