summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2005-07-27 10:39:04 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2005-07-27 10:39:04 +0000
commit2a1c93ccd24442c1a7808f70e9183bac098915fe (patch)
tree5a5c54bca298d6abf807ceba8930e9ea09d1a7a5
parent8dc33cb24f30ce59b0ad0bd9e14195583712d210 (diff)
Silence bogus -Wuninitialized warnings; ok djm@
-rw-r--r--usr.bin/ssh/hostfile.c4
-rw-r--r--usr.bin/ssh/scp.c4
-rw-r--r--usr.bin/ssh/sftp-client.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/hostfile.c b/usr.bin/ssh/hostfile.c
index bf2a31c9bab..63550a29ddb 100644
--- a/usr.bin/ssh/hostfile.c
+++ b/usr.bin/ssh/hostfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.35 2005/07/27 10:39:03 dtucker Exp $");
#include <resolv.h>
#include <openssl/hmac.h>
@@ -315,7 +315,7 @@ add_host_to_hostfile(const char *filename, const char *host, const Key *key,
{
FILE *f;
int success = 0;
- char *hashed_host;
+ char *hashed_host = NULL;
if (key == NULL)
return 1; /* XXX ? */
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index c0aa0388ccf..d02e69022a4 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -71,7 +71,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.124 2005/06/17 02:44:33 djm Exp $");
+RCSID("$OpenBSD: scp.c,v 1.125 2005/07/27 10:39:03 dtucker Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -501,7 +501,7 @@ source(int argc, char **argv)
BUF *bp;
off_t i, amt, statbytes;
size_t result;
- int fd, haderr, indx;
+ int fd = -1, haderr, indx;
char *last, *name, buf[2048];
int len;
diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index baad4118ab2..8ac93f34343 100644
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/sftp-client.c
@@ -20,7 +20,7 @@
/* XXX: copy between two remote sites */
#include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.56 2005/07/17 07:17:55 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.57 2005/07/27 10:39:03 dtucker Exp $");
#include <sys/queue.h>
@@ -742,7 +742,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
Attrib junk, *a;
Buffer msg;
char *handle;
- int local_fd, status, write_error;
+ int local_fd, status = 0, write_error;
int read_error, write_errno;
u_int64_t offset, size;
u_int handle_len, mode, type, id, buflen, num_req, max_req;