Fix a typo in last commit

* lib-src/etags.c (C_entries): Fix a typo.

* test/etags/ETAGS.good_1:
* test/etags/ETAGS.good_2:
* test/etags/ETAGS.good_3:
* test/etags/ETAGS.good_4:
* test/etags/ETAGS.good_5:
* test/etags/CTAGS.good: Update due to the change in etags.c.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 73dd5a8a405164675dd8401a79eaa14e9f3d72ea..f124d290da37a929e4c4299c6e3577b34d245e42 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -3355,7 +3355,7 @@ C_entries (int c_ext, FILE *inf)
                                {
                                  linebuffer_setlen (&token_name, toklen);
                                  sprintf (token_name.buffer, "%.*s",
-                                          newlb.buffer + tokoff);
+                                          toklen, newlb.buffer + tokoff);
                                }
                              token.named = true;
                            }

diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good
index 045c52a579607200db1c06ccc0a354f44721559f..2cfadb9ec6efde6c6d344aa26c7ae1554fa9f7b2 100644 (file)
--- a/test/etags/CTAGS.good
+++ b/test/etags/CTAGS.good
@@ -1,4 +1,3 @@
-       objc-src/Subprocess.m   /^@interface Subprocess(Private)$/
 #a-defer-word  forth-src/test-forth.fth        /^defer #a-defer-word$/
 #some-storage  forth-src/test-forth.fth        /^2000 buffer: #some-storage$/
 $      make-src/Makefile       /^      @-$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/
@@ -1061,6 +1060,7 @@ Pkg1_Proc2/p      ada-src/waroquiers.ada  /^  procedure Pkg1_Proc2 (I : Integer);$/
 Pkg1_Proc2/p   ada-src/waroquiers.ada  /^  procedure Pkg1_Proc2 (I : Integer) is$/
 PostControls   pyt-src/server.py       /^    def PostControls(self):$/
 Pre_Call_State/t       ada-src/2ataspri.ads    /^   type Pre_Call_State is new System.Address;$/
+Private        objc-src/Subprocess.m   /^@interface Subprocess(Private)$/
 Private_T/b    ada-src/etags-test-for.ada      /^    task body Private_T is$/
 Private_T/b    ada-src/waroquiers.ada  /^    task body Private_T is$/
 Private_T/k    ada-src/etags-test-for.ada      /^    task Private_T;$/

diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1
index dfaa5e1974458e69ec8514839f4d72a5ce3708f7..ebd079f253a1dc59a435fdf33132470bab662d32 100644 (file)
--- a/test/etags/ETAGS.good_1
+++ b/test/etags/ETAGS.good_1
@@ -2366,10 +2366,10 @@ objc-src/Subprocess.h,98
 #define BUFFERSIZE \7f43,1267
 @interface Subprocess:\7fSubprocess\ 145,1292
 \f
-objc-src/Subprocess.m,447
+objc-src/Subprocess.m,446
 #define        PTY_TEMPLATE \7f20,494
 #define        PTY_LENGTH \7f21,528
-@interface Subprocess(Private)\7f\ 132,737
+@interface Subprocess(Private)\7f32,737
 - childDidExit\7f39,851
 - fdHandler:\7ffdHandler\ 167,1589
 showError \7f98,2360

diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2
index b0b08b135bcf16bf9681ecfa0e7716a4ec0a4134..12554bd95f140b1738e2ddda75fb732122535104 100644 (file)
--- a/test/etags/ETAGS.good_2
+++ b/test/etags/ETAGS.good_2
@@ -2934,11 +2934,11 @@ objc-src/Subprocess.h,98
 #define BUFFERSIZE \7f43,1267
 @interface Subprocess:\7fSubprocess\ 145,1292
 \f
-objc-src/Subprocess.m,477
+objc-src/Subprocess.m,476
 #define        PTY_TEMPLATE \7f20,494
 #define        PTY_LENGTH \7f21,528
 static void showError(\7f23,551
-@interface Subprocess(Private)\7f\ 132,737
+@interface Subprocess(Private)\7f32,737
 - childDidExit\7f39,851
 - fdHandler:\7ffdHandler\ 167,1589
 showError \7f98,2360

diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3
index a8839e69becc7ee9b49fb602eb4736f36bdaa0a2..714903c205f956e30f7efcadc2be9dbf5fddf1fd 100644 (file)
--- a/test/etags/ETAGS.good_3
+++ b/test/etags/ETAGS.good_3
@@ -2683,10 +2683,10 @@ objc-src/Subprocess.h,98
 #define BUFFERSIZE \7f43,1267
 @interface Subprocess:\7fSubprocess\ 145,1292
 \f
-objc-src/Subprocess.m,447
+objc-src/Subprocess.m,446
 #define        PTY_TEMPLATE \7f20,494
 #define        PTY_LENGTH \7f21,528
-@interface Subprocess(Private)\7f\ 132,737
+@interface Subprocess(Private)\7f32,737
 - childDidExit\7f39,851
 - fdHandler:\7ffdHandler\ 167,1589
 showError \7f98,2360

diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4
index 6fb92f0793a8e09c5659349ea0271580b7e4cf2b..5dd8d551460a944675391795e851bb91b82412e9 100644 (file)
--- a/test/etags/ETAGS.good_4
+++ b/test/etags/ETAGS.good_4
@@ -2530,10 +2530,10 @@ objc-src/Subprocess.h,98
 #define BUFFERSIZE \7f43,1267
 @interface Subprocess:\7fSubprocess\ 145,1292
 \f
-objc-src/Subprocess.m,447
+objc-src/Subprocess.m,446
 #define        PTY_TEMPLATE \7f20,494
 #define        PTY_LENGTH \7f21,528
-@interface Subprocess(Private)\7f\ 132,737
+@interface Subprocess(Private)\7f32,737
 - childDidExit\7f39,851
 - fdHandler:\7ffdHandler\ 167,1589
 showError \7f98,2360

diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5
index 8055c5951f5801fed00d1b774bcb90e150fe5e56..526ad4079b8b6519ca396bcc915f8628c018ad72 100644 (file)
--- a/test/etags/ETAGS.good_5
+++ b/test/etags/ETAGS.good_5
@@ -3415,11 +3415,11 @@ objc-src/Subprocess.h,98
 #define BUFFERSIZE \7f43,1267
 @interface Subprocess:\7fSubprocess\ 145,1292
 \f
-objc-src/Subprocess.m,477
+objc-src/Subprocess.m,476
 #define        PTY_TEMPLATE \7f20,494
 #define        PTY_LENGTH \7f21,528
 static void showError(\7f23,551
-@interface Subprocess(Private)\7f\ 132,737
+@interface Subprocess(Private)\7f32,737
 - childDidExit\7f39,851
 - fdHandler:\7ffdHandler\ 167,1589
 showError \7f98,2360