From 547fb2dcfd4a06291081356625b01984bc5bb2a5 Mon Sep 17 00:00:00 2001 From: Jérôme Laurens Date: Fri, 11 Mar 2011 08:56:01 +0000 Subject: synctex: typo fixed, last commit broke synctex command line tool git-svn-id: svn://tug.org/texlive/trunk@21687 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/synctexdir/synctex_parser.c | 14 +++++++------- Build/source/texk/web2c/synctexdir/synctex_parser_utils.c | 14 +++++++------- Build/source/texk/web2c/synctexdir/synctex_parser_utils.h | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser.c b/Build/source/texk/web2c/synctexdir/synctex_parser.c index 48f88f2990b..a45eaced16e 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_parser.c +++ b/Build/source/texk/web2c/synctexdir/synctex_parser.c @@ -2555,14 +2555,14 @@ bail: goto next_sheet; } -int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_type * io_modeRef); +int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_modeRef); /* Where the synctex scanner is created. */ synctex_scanner_t synctex_scanner_new_with_output_file(const char * output, const char * build_directory, int parse) { gzFile file = NULL; char * synctex = NULL; synctex_scanner_t scanner = NULL; - synctex_io_mode_type io_mode = 0; + synctex_io_mode_t io_mode = 0; /* Here we assume that int are smaller than void * */ if (sizeof(int)>sizeof(void*)) { _synctex_error("INTERNAL INCONSISTENCY: int's are unexpectedly bigger than pointers, bailing out."); @@ -2602,7 +2602,7 @@ synctex_scanner_t synctex_scanner_new_with_output_file(const char * output, cons return parse? synctex_scanner_parse(scanner):scanner; } -int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_type * io_mode_ref); +int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_mode_ref); /* This functions opens the file at the "output" given location. * It manages the problem of quoted filenames that appear with pdftex and filenames containing the space character. @@ -2610,14 +2610,14 @@ int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ * This function will remove them if possible. * All the reference arguments will take a value on return. They must be non NULL. * 0 on success, non 0 on error. */ -int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_type * io_mode_ref) { +int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_mode_ref) { if (synctex_name_ref && file_ref && io_mode_ref) { /* 1 local variables that uses dynamic memory */ char * synctex_name = NULL; gzFile the_file = NULL; char * quoteless_synctex_name = NULL; size_t size = 0; - synctex_io_mode_type io_mode = *io_mode_ref; + synctex_io_mode_t io_mode = *io_mode_ref; const char * mode = _synctex_get_io_mode_name(io_mode); /* now create the synctex file name */ size = strlen(output)+strlen(synctex_suffix)+strlen(synctex_suffix_gz)+1; @@ -2731,7 +2731,7 @@ return_on_error: /* Opens the ouput file, taking into account the eventual build_directory. * 0 on success, non 0 on error. */ -int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_type * io_mode_ref) { +int _synctex_open(const char * output, const char * build_directory, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_mode_ref) { # define synctex_name (*synctex_name_ref) # define the_file (*file_ref) int result = __synctex_open(output,synctex_name_ref,file_ref,add_quotes,io_mode_ref); @@ -4157,7 +4157,7 @@ struct __synctex_updater_t { synctex_updater_t synctex_updater_new_with_output_file(const char * output, const char * build_directory) { synctex_updater_t updater = NULL; char * synctex = NULL; - synctex_io_mode_type io_mode = synctex_io_mode_read; + synctex_io_mode_t io_mode = synctex_io_mode_read; const char * mode = NULL; /* prepare the updater, the memory is the only one dynamically allocated */ updater = (synctex_updater_t)_synctex_malloc(sizeof(synctex_updater_t)); diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c index bed67e03902..b5132148449 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c +++ b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.c @@ -295,13 +295,13 @@ char * _synctex_merge_strings(const char * first,...) { * There is a list of possible filenames from which we return the most recent one and try to remove all the others. * With two runs of pdftex or xetex we are sure the the synctex file is really the most appropriate. */ -int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_compress_mode_t * compress_mode_ref) +int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_t * io_mode_ref) { - if(output && synctex_name_ref && compress_mode_ref) { + if(output && synctex_name_ref && io_mode_ref) { /* If output is already absolute, we just have to manage the quotes and the compress mode */ size_t size = 0; char * synctex_name = NULL; - synctex_io_mode_type compress_mode = *compress_mode_ref; + synctex_io_mode_t io_mode = *io_mode_ref; const char * base_name = _synctex_last_path_component(output); /* do not free, output is the owner. base name of output*/ /* Do we have a real base name ? */ if(strlen(base_name)>0) { @@ -416,9 +416,9 @@ int _synctex_get_name(const char * output, const char * build_directory, char ** the_time=buf.st_mtime; \ synctex_name = FILENAME; \ if (COMPRESS_MODE) { \ - compress_mode |= synctex_io_gz_mask; \ + io_mode |= synctex_io_gz_mask; \ } else { \ - compress_mode &= ~synctex_io_gz_mask; \ + io_mode &= ~synctex_io_gz_mask; \ } \ } \ } @@ -450,7 +450,7 @@ int _synctex_get_name(const char * output, const char * build_directory, char ** # undef CLEAN_AND_REMOVE /* set up the returned values */ * synctex_name_ref = synctex_name; - * compress_mode_ref = compress_mode; + * io_mode_ref = io_mode; return 0; } return -1;/* bad argument */ @@ -458,7 +458,7 @@ int _synctex_get_name(const char * output, const char * build_directory, char ** return -2; } -const char * _synctex_get_io_mode_name(synctex_io_mode_type io_mode) { +const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode) { static const char * synctex_io_modes[4] = {"r","rb","a","ab"}; unsigned index = (io_mode & synctex_io_gz_mask) + 2 * (io_mode & synctex_io_append_mask); return synctex_io_modes[index]; diff --git a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h index ac6de5578fd..17c72110db8 100644 --- a/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h +++ b/Build/source/texk/web2c/synctexdir/synctex_parser_utils.h @@ -109,7 +109,7 @@ int _synctex_copy_with_quoting_last_path_component(const char * src, char ** des static const char * synctex_suffix = ".synctex"; static const char * synctex_suffix_gz = ".gz"; -typedef unsigned int synctex_io_mode_type; +typedef unsigned int synctex_io_mode_t; typedef enum { synctex_io_append_mask = 1, @@ -120,10 +120,10 @@ enum { synctex_io_mode_read = 0 }; -int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_type * compress_mode_ref); +int _synctex_get_name(const char * output, const char * build_directory, char ** synctex_name_ref, synctex_io_mode_t * io_mode_ref); /* returns the correct mode required by fopen and gzopen from the given io_mode */ -const char * _synctex_get_io_mode_name(synctex_io_mode_type io_mode); +const char * _synctex_get_io_mode_name(synctex_io_mode_t io_mode); #ifdef __cplusplus } -- cgit v1.2.3