Module Name: src
Committed By: christos
Date: Sun Feb 11 02:51:58 UTC 2018
Modified Files:
src/usr.bin/ftp: fetch.c
Log Message:
more volatile to appease gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/usr.bin/ftp/fetch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.229 src/usr.bin/ftp/fetch.c:1.230
--- src/usr.bin/ftp/fetch.c:1.229 Sat Nov 25 10:39:17 2017
+++ src/usr.bin/ftp/fetch.c Sat Feb 10 21:51:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.229 2017/11/25 15:39:17 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.230 2018/02/11 02:51:58 christos Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.229 2017/11/25 15:39:17 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.230 2018/02/11 02:51:58 christos Exp $");
#endif /* not lint */
/*
@@ -1277,7 +1277,7 @@ fetch_url(const char *url, const char *p
static char *xferbuf;
const char *cp;
char *ep;
- char *auth;
+ char *volatile auth;
char *volatile savefile;
char *volatile location;
char *volatile message;
@@ -1460,7 +1460,8 @@ fetch_url(const char *url, const char *p
#ifdef WITH_SSL
if (isproxy && oui.utype == HTTPS_URL_T) {
switch (connectmethod(fin, url, penv, &oui, &ui,
- &wauth, &pauth, &auth, &hasleading, &rval)) {
+ &wauth, &pauth, __UNVOLATILE(&auth), &hasleading,
+ &rval)) {
case C_CLEANUP:
goto cleanup_fetch_url;
case C_IMPROPER:
@@ -1496,7 +1497,8 @@ fetch_url(const char *url, const char *p
alarmtimer(0);
switch (negotiate_connection(fin, url, penv, &pi,
- &mtime, &wauth, &pauth, &rval, &ischunked, &auth)) {
+ &mtime, &wauth, &pauth, &rval, &ischunked,
+ __UNVOLATILE(&auth))) {
case C_OK:
break;
case C_CLEANUP:
