1*4882a593SmuzhiyunFrom dfc801c44a93bed7b3951905b188823d6a0432c8 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Sergey Poznyakoff <gray@gnu.org> 3*4882a593SmuzhiyunDate: Wed, 11 Aug 2021 18:10:38 +0300 4*4882a593SmuzhiyunSubject: Fix previous commit 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun* src/dstring.c (ds_reset,ds_concat): Don't call ds_resize in a 7*4882a593Smuzhiyunloop. 8*4882a593Smuzhiyun 9*4882a593Smuzhiyun[Retrieved from: 10*4882a593Smuzhiyunhttps://git.savannah.gnu.org/cgit/cpio.git/commit/?id=dfc801c44a93bed7b3951905b188823d6a0432c8] 11*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 12*4882a593Smuzhiyun--- 13*4882a593Smuzhiyun src/dstring.c | 4 ++-- 14*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/src/dstring.c b/src/dstring.c 17*4882a593Smuzhiyunindex 692d3e7..b7e0bb5 100644 18*4882a593Smuzhiyun--- a/src/dstring.c 19*4882a593Smuzhiyun+++ b/src/dstring.c 20*4882a593Smuzhiyun@@ -64,7 +64,7 @@ void 21*4882a593Smuzhiyun ds_reset (dynamic_string *s, size_t len) 22*4882a593Smuzhiyun { 23*4882a593Smuzhiyun while (len > s->ds_size) 24*4882a593Smuzhiyun- ds_resize (s); 25*4882a593Smuzhiyun+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); 26*4882a593Smuzhiyun s->ds_idx = len; 27*4882a593Smuzhiyun } 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun@@ -116,7 +116,7 @@ ds_concat (dynamic_string *s, char const *str) 30*4882a593Smuzhiyun { 31*4882a593Smuzhiyun size_t len = strlen (str); 32*4882a593Smuzhiyun while (len + 1 > s->ds_size) 33*4882a593Smuzhiyun- ds_resize (s); 34*4882a593Smuzhiyun+ s->ds_string = x2nrealloc (s->ds_string, &s->ds_size, 1); 35*4882a593Smuzhiyun memcpy (s->ds_string + s->ds_idx, str, len); 36*4882a593Smuzhiyun s->ds_idx += len; 37*4882a593Smuzhiyun s->ds_string[s->ds_idx] = 0; 38*4882a593Smuzhiyun-- 39*4882a593Smuzhiyuncgit v1.2.1 40*4882a593Smuzhiyun 41