From 4d9bc24d1b0c7f28b5dde20dd49716d286de4fcc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 10:27:30 -1000 Subject: [PATCH] Remove an unused var and let build-release scp the files (#4150) (#4151) Just noticed a warning while building 6.1.1, pls one less copy/paste thing for me to do during release. Co-authored-by: Paul Wessel --- admin/build-release.sh | 4 +++- src/postscriptlight.c | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/admin/build-release.sh b/admin/build-release.sh index eb02fe7e96c..f286abfd348 100755 --- a/admin/build-release.sh +++ b/admin/build-release.sh @@ -125,4 +125,6 @@ echo "build-release.sh: Place gmt-${Version}-src.tar.* on the ftp site" >&2 if [ -f gmt-${Version}-darwin-x86_64.dmg ]; then echo "build-release.sh: Place gmt-${Version}-darwin-x86_64.dmg on the ftp site" >&2 fi -#scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp:/export/ftp1/ftp/pub/pwessel/release +if [ "${USER}" = "pwessel" ]; then # Place file in pwessel SOEST ftp release directory + scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp.soest.hawaii.edu:/export/ftp1/ftp/pub/pwessel/release +fi diff --git a/src/postscriptlight.c b/src/postscriptlight.c index ede8c3d82c1..e747c34ead1 100644 --- a/src/postscriptlight.c +++ b/src/postscriptlight.c @@ -4860,7 +4860,7 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) { * We look for such cases and count the occurrences, plus replace the font changing code * @ (either @~ or @%font% with ASCII escape (27)). */ size_t k; - int n = 0, step; + int n = 0; for (k = 0; k < strlen (text); k++) { if (text[k] != '@') continue; /* Start of an escape sequence */ @@ -4872,14 +4872,11 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) { /* Here we do have such a thing, and we need to avoid the regular string splitting at @ in PSL_plottext and PSL_deftextdim */ text[k] = PSL_ASCII_ES; /* Replace @ with ASCII ESC code for now */ k++; /* Font code type is ~ or % */ - if (text[k] == '~') { /* Symbol font */ + if (text[k] == '~') /* Symbol font */ k++; /* Step to character2 */ - step = 1; /* Since we will toggle back with @~ */ - } else { /* Some random font switch */ k++; /* Step past first % */ while (text[k] != '%') k++; /* Skip past the font name or number */ - step = 2; /* Since we will toggle back with @%% */ k++; /* Step to character2 */ } if (text[k] == '\\') k += 4; else k++; /* Skip the octal or regular second character */