Skip to content

Commit b97021e

Browse files
PaulWesselgithub-actions[bot]
authored andcommitted
Remove an unused var and let build-release scp the files (#4150)
Just noticed a warning while building 6.1.1, pls one less copy/paste thing for me to do during release.
1 parent 60ab88b commit b97021e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

admin/build-release.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,6 @@ echo "build-release.sh: Place gmt-${Version}-src.tar.* on the ftp site" >&2
125125
if [ -f gmt-${Version}-darwin-x86_64.dmg ]; then
126126
echo "build-release.sh: Place gmt-${Version}-darwin-x86_64.dmg on the ftp site" >&2
127127
fi
128-
#scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp:/export/ftp1/ftp/pub/pwessel/release
128+
if [ "${USER}" = "pwessel" ]; then # Place file in pwessel SOEST ftp release directory
129+
scp gmt-${Version}-darwin-x86_64.dmg gmt-${Version}-src.tar.* ftp.soest.hawaii.edu:/export/ftp1/ftp/pub/pwessel/release
130+
fi

src/postscriptlight.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4860,7 +4860,7 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) {
48604860
* We look for such cases and count the occurrences, plus replace the font changing code
48614861
* @ (either @~ or @%font% with ASCII escape (27)). */
48624862
size_t k;
4863-
int n = 0, step;
4863+
int n = 0;
48644864
for (k = 0; k < strlen (text); k++) {
48654865
if (text[k] != '@') continue;
48664866
/* Start of an escape sequence */
@@ -4872,14 +4872,11 @@ void psl_got_composite_fontswitch (struct PSL_CTRL *PSL, char *text) {
48724872
/* Here we do have such a thing, and we need to avoid the regular string splitting at @ in PSL_plottext and PSL_deftextdim */
48734873
text[k] = PSL_ASCII_ES; /* Replace @ with ASCII ESC code for now */
48744874
k++; /* Font code type is ~ or % */
4875-
if (text[k] == '~') { /* Symbol font */
4875+
if (text[k] == '~') /* Symbol font */
48764876
k++; /* Step to character2 */
4877-
step = 1; /* Since we will toggle back with @~ */
4878-
}
48794877
else { /* Some random font switch */
48804878
k++; /* Step past first % */
48814879
while (text[k] != '%') k++; /* Skip past the font name or number */
4882-
step = 2; /* Since we will toggle back with @%% */
48834880
k++; /* Step to character2 */
48844881
}
48854882
if (text[k] == '\\') k += 4; else k++; /* Skip the octal or regular second character */

0 commit comments

Comments
 (0)