patch 9.1.2030: inefficient use of ga_concat()

Problem:  inefficient use of ga_concat()
Solution: Use ga_concat_len() when length is known.
          (John Marriott)

closes: #19027

Signed-off-by: John Marriott <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>

Author: John Marriott

src/cmdexpand.c

@@ -4773,10 +4773,13 @@ copy_substring_from_pos(pos_T *start, pos_T *end, char_u **match,
     {
 	for (lnum = start->lnum + 1; lnum < end->lnum; lnum++)
 	{
+	    int  linelen;
+
 	    line = ml_get(lnum);
-	    if (ga_grow(&ga, ml_get_len(lnum) + 2) != OK)
+	    linelen = (int)ml_get_len(lnum);
+	    if (ga_grow(&ga, linelen + 2) != OK)
 		return FAIL;
-	    ga_concat(&ga, line);
+	    ga_concat_len(&ga, line, linelen);
 	    if (exacttext)
 		ga_concat_len(&ga, (char_u *)"\\n", 2);
 	    else

src/dict.c

@@ -817,15 +817,15 @@ dict2string(typval_T *tv, int copyID, int restore_copyID)
 	    if (first)
 		first = FALSE;
 	    else
-		ga_concat(&ga, (char_u *)", ");
+		ga_concat_len(&ga, (char_u *)", ", 2);
 
 	    tofree = string_quote(hi->hi_key, FALSE);
 	    if (tofree != NULL)
 	    {
 		ga_concat(&ga, tofree);
 		vim_free(tofree);
 	    }
-	    ga_concat(&ga, (char_u *)": ");
+	    ga_concat_len(&ga, (char_u *)": ", 2);
 	    s = echo_string_core(&HI2DI(hi)->di_tv, &tofree, numbuf, copyID,
 						 FALSE, restore_copyID, TRUE);
 	    if (s != NULL)

src/getchar.c

@@ -4288,7 +4288,7 @@ getcmdkeycmd(
 	}
 	else if (c1 == K_SNR)
 	{
-	    ga_concat(&line_ga, (char_u *)"<SNR>");
+	    ga_concat_len(&line_ga, (char_u *)"<SNR>", 5);
 	}
 	else
 	{

src/if_xcmdsrv.c

@@ -666,7 +666,7 @@ serverGetVimNames(Display *dpy)
 	    if (WindowValid(dpy, (Window)w))
 	    {
 		ga_concat(&ga, p + 1);
-		ga_concat(&ga, (char_u *)"\n");
+		ga_concat_len(&ga, (char_u *)"\n", 1);
 	    }
 	    while (*p != 0)
 		p++;
@@ -1343,7 +1343,7 @@ server_parse_message(
 			    ga_concat(&reply,
 				   (char_u *)_(e_invalid_expression_received));
 			    ga_append(&reply, 0);
-			    ga_concat(&reply, (char_u *)"-c 1");
+			    ga_concat_len(&reply, (char_u *)"-c 1", 4);
 			}
 			ga_append(&reply, NUL);
 			(void)AppendPropCarefully(dpy, resWindow, commProperty,

src/job.c

@@ -1452,7 +1452,7 @@ job_start(
 	for (i = 0; i < argc; ++i)
 	{
 	    if (i > 0)
-		ga_concat(&ga, (char_u *)"  ");
+		ga_concat_len(&ga, (char_u *)"  ", 2);
 	    ga_concat(&ga, (char_u *)argv[i]);
 	}
 	ga_append(&ga, NUL);

src/os_mswin.c

@@ -2246,7 +2246,7 @@ enumWindowsGetNames(HWND hwnd, LPARAM lparam)
 
     // Add the name to the list
     ga_concat(ga, (char_u *)server);
-    ga_concat(ga, (char_u *)"\n");
+    ga_concat_len(ga, (char_u *)"\n", 1);
     return TRUE;
 }
 

src/regexp_nfa.c

@@ -2891,16 +2891,16 @@ nfa_print_state2(FILE *debugf, nfa_state_T *state, garray_T *indent)
     // grow indent for state->out
     indent->ga_len -= 1;
     if (state->out1)
-	ga_concat(indent, (char_u *)"| ");
+	ga_concat_len(indent, (char_u *)"| ", 2);
     else
-	ga_concat(indent, (char_u *)"  ");
+	ga_concat_len(indent, (char_u *)"  ", 2);
     ga_append(indent, NUL);
 
     nfa_print_state2(debugf, state->out, indent);
 
     // replace last part of indent for state->out1
     indent->ga_len -= 3;
-    ga_concat(indent, (char_u *)"  ");
+    ga_concat_len(indent, (char_u *)"  ", 2);
     ga_append(indent, NUL);
 
     nfa_print_state2(debugf, state->out1, indent);

src/scriptfile.c

@@ -2558,7 +2558,7 @@ getsourceline(
 		ga_concat(&ga, p + 1);
 	    else if (*p == '|')
 	    {
-		ga_concat(&ga, (char_u *)" ");
+		ga_concat_len(&ga, (char_u *)" ", 1);
 		ga_concat(&ga, p);
 	    }
 	    for (;;)
@@ -2583,7 +2583,7 @@ getsourceline(
 			ga_concat(&ga, p + 1);
 		    else
 		    {
-			ga_concat(&ga, (char_u *)" ");
+			ga_concat_len(&ga, (char_u *)" ", 1);
 			ga_concat(&ga, p);
 		    }
 		}

src/userfunc.c

@@ -1405,7 +1405,7 @@ get_function_body(
 	    // For a :def function "python << EOF" concatenates all the lines,
 	    // to be used for the instruction later.
 	    ga_concat(&heredoc_ga, theline);
-	    ga_concat(&heredoc_ga, (char_u *)"\n");
+	    ga_concat_len(&heredoc_ga, (char_u *)"\n", 1);
 	    p = vim_strnsave((char_u *)"", 0);
 	}
 	else

src/version.c

@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2030,
 /**/
     2029,
 /**/