diff options
author | Jérôme Laurens <jerome.laurens@u-bourgogne.fr> | 2010-05-13 07:09:22 +0000 |
---|---|---|
committer | Jérôme Laurens <jerome.laurens@u-bourgogne.fr> | 2010-05-13 07:09:22 +0000 |
commit | bcbec8522a4973bfbd5bb14d500001aebed96435 (patch) | |
tree | 72428cf9fca4ad908cb250d4030ca9e56190c681 /Build/source/texk/web2c | |
parent | 44f26a3f760f07988625cb3200168e417f8eadaf (diff) |
very minor change in code design to remove wrong warnings when building xetex.
git-svn-id: svn://tug.org/texlive/trunk@18225 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/synctexdir/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/synctexdir/synctex.c | 21 |
2 files changed, 15 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index 164d289dab4..65d57a4efa3 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,10 +1,14 @@ 2010-05-13 Jerome Laurens <jerome.laurens@u-bourgogne.fr> + * synctex.c, very minor change in code design to remove wrong warnings when building xetex. + +2010-05-13 Jerome Laurens <jerome.laurens@u-bourgogne.fr> + * synctex.c, change in code design. The macro layer is enhanced to take luatex into account. Luatex can now safely use this file instead of luatexdir/utils/synctex.c, provided luatexdir/utils/synctex-luatex.h is updated accordingly. - No change for pdftex not xetex. + No change for pdftex nor xetex. * synctex.c, typos fixed, some wrong "size_t" causing false warnings replaced by "int". diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c index e5b711fa453..38afbe66eae 100644 --- a/Build/source/texk/web2c/synctexdir/synctex.c +++ b/Build/source/texk/web2c/synctexdir/synctex.c @@ -88,6 +88,7 @@ Version 3 - very minor design change to take luatex into account - typo fixed - some size_t replaced by int +- very minor code design change to remove wrong xetex specific warnings Version 2 Fri Sep 19 14:55:31 UTC 2008 @@ -418,13 +419,13 @@ static void *synctex_dot_open(void) either SYNCTEX_FILE is nonnegative or synchronization is definitely disabled. */ { - size_t len; char *tmp = SYNCTEX_GET_JOB_NAME(); + size_t len = strlen(tmp); /* jobname was set by the \jobname command on the *TeX side */ - char *the_busy_name = xmalloc((unsigned) - (strlen(tmp) + strlen(synctex_suffix) + - strlen(synctex_suffix_gz) + - strlen(synctex_suffix_busy) + 1)); + char *the_busy_name = xmalloc((size_t) + (len + strlen(synctex_suffix) + + strlen(synctex_suffix_gz) + + strlen(synctex_suffix_busy) + 1)); if (!the_busy_name) { SYNCTEX_FREE(tmp); synctexabort(0); @@ -434,7 +435,6 @@ static void *synctex_dot_open(void) synctex_ctxt.flags.quoted = 0; strcpy(the_busy_name, tmp); # else - len = strlen(tmp); if (len > 0 && tmp[0] == '"' && tmp[len - 1] == '"') { /* We are certainly on a pdftex like engine and the input file name did contain spaces inside. Quotes where added around that file name. We prefer to remove the quotes to have a human readable name. @@ -684,13 +684,13 @@ void synctexterminate(boolean log_opened) remove(the_real_syncname); } } else if ((tmp = SYNCTEX_GET_JOB_NAME())) { - size_t len; + size_t len = strlen(tmp); /* There was a problem with the output. We just try to remove existing synctex output files including the busy one. */ - the_real_syncname = xmalloc((unsigned) - (strlen(tmp) + strlen(synctex_suffix) + - strlen(synctex_suffix_gz) + 1)); + the_real_syncname = xmalloc((size_t) + (len + strlen(synctex_suffix) + + strlen(synctex_suffix_gz) + 1)); if (!the_real_syncname) { SYNCTEX_FREE(tmp); synctexabort(0); @@ -699,7 +699,6 @@ void synctexterminate(boolean log_opened) # if defined(XeTeX) strcpy(the_real_syncname, tmp); # else - len = strlen(tmp); if (len > 0 && tmp[0] == '"' && tmp[len - 1] == '"') { /* See above a similar situation. */ strcpy(the_real_syncname, tmp + 1); /* only copy what follows the leading " character */ |