summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/scp.c
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2000-03-26 07:07:24 +0000
committerkris <kris@FreeBSD.org>2000-03-26 07:07:24 +0000
commitb201b15ee1575ab28ed4f9b5a7d430e835a7c7ae (patch)
tree561c850bc04e7b62c9fc641be89ac412589219c1 /crypto/openssh/scp.c
parentfc557ff7d97438559e69347575f5aa8ef03a5f50 (diff)
downloadFreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.zip
FreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.tar.gz
Virgin import of OpenSSH sources dated 2000/03/25
Diffstat (limited to 'crypto/openssh/scp.c')
-rw-r--r--crypto/openssh/scp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/scp.c b/crypto/openssh/scp.c
index 16ac0eb..915ef97 100644
--- a/crypto/openssh/scp.c
+++ b/crypto/openssh/scp.c
@@ -45,7 +45,7 @@
*/
#include "includes.h"
-RCSID("$Id: scp.c,v 1.25 2000/01/24 22:11:20 markus Exp $");
+RCSID("$Id: scp.c,v 1.26 2000/03/16 20:56:14 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -1006,7 +1006,7 @@ run_err(const char *fmt,...)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scp.c,v 1.25 2000/01/24 22:11:20 markus Exp $
+ * $Id: scp.c,v 1.26 2000/03/16 20:56:14 markus Exp $
*/
char *
@@ -1118,7 +1118,7 @@ alarmtimer(int wait)
}
void
-updateprogressmeter(void)
+updateprogressmeter(int ignore)
{
int save_errno = errno;
@@ -1224,7 +1224,7 @@ progressmeter(int flag)
atomicio(write, fileno(stdout), buf, strlen(buf));
if (flag == -1) {
- signal(SIGALRM, (void *) updateprogressmeter);
+ signal(SIGALRM, updateprogressmeter);
alarmtimer(1);
} else if (flag == 1) {
alarmtimer(0);
OpenPOWER on IntegriCloud