mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

; Fix last change in etags.c

Browse source 
* lib-src/etags.c (cleanup_tags_file): Renamed from
clean_matched_file_tag.

* test/manual/etags/CTAGS.good_update:
* test/manual/etags/CTAGS.good_crlf: Update to match the test.
This commit is contained in:
Eli Zaretskii 2022-11-27 15:43:39 +02:00
parent d48bb4874b
commit 6f0906be51
3 changed files with 5645 additions and 5644 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib-src/etags.c
View file

@ -399,7 +399,7 @@ static void free_fdesc (fdesc *);
static void pfnote (char *, bool, char *, ptrdiff_t, intmax_t, intmax_t); static void pfnote (char *, bool, char *, ptrdiff_t, intmax_t, intmax_t);
static void invalidate_nodes (fdesc *, node **); static void invalidate_nodes (fdesc *, node **);
static void put_entries (node *); static void put_entries (node *);
static void clean_matched_file_tag (char const * const, char const * const); static void cleanup_tags_file (char const * const, char const * const);
static void do_move_file (const char *, const char *); static void do_move_file (const char *, const char *);
static char *concat (const char *, const char *, const char *); static char *concat (const char *, const char *, const char *);
@ -1392,7 +1392,7 @@ main (int argc, char **argv)
default: default:
continue; /* the for loop */ continue; /* the for loop */
} }
clean_matched_file_tag (tagfile, argbuffer[i].what); cleanup_tags_file (tagfile, argbuffer[i].what);
} }
append_to_tagfile = true; append_to_tagfile = true;
} }
@ -1442,7 +1442,7 @@ main (int argc, char **argv)
* Equivalent to: mv tags OTAGS;grep -Fv ' filename ' OTAGS >tags;rm OTAGS * Equivalent to: mv tags OTAGS;grep -Fv ' filename ' OTAGS >tags;rm OTAGS
*/ */
static void static void
clean_matched_file_tag (const char* tagfile, const char* match_file_name) cleanup_tags_file (const char* tagfile, const char* match_file_name)
{ {
FILE *otags_f = fopen ("OTAGS", "wb"); FILE *otags_f = fopen ("OTAGS", "wb");
FILE *tag_f = fopen (tagfile, "rb"); FILE *tag_f = fopen (tagfile, "rb");
@ -7275,7 +7275,8 @@ get_lispy_tag (register char *bp)
* appended to `filebuf'. * appended to `filebuf'.
*/ */
static ptrdiff_t static ptrdiff_t
readline_internal (linebuffer *lbp, FILE *stream, char const *filename, const bool leave_cr) readline_internal (linebuffer *lbp, FILE *stream, char const *filename,
const bool leave_cr)
{ {
char *buffer = lbp->buffer; char *buffer = lbp->buffer;
char *p = lbp->buffer; char *p = lbp->buffer;

5642
test/manual/etags/CTAGS.good_crlf
View file

File diff suppressed because it is too large Load diff

5638
test/manual/etags/CTAGS.good_update
View file

File diff suppressed because it is too large Load diff