4 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index c63e20675..63339593a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20050802
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2005/07/27 10:39:03
+     [scp.c hostfile.c sftp-client.c]
+     Silence bogus -Wuninitialized warnings; ok djm@
+
 20050726
  - (dtucker) [configure.ac] Update zlib warning message too, pointed out by
    tim@.
@@ -2879,4 +2885,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3857 2005/07/26 11:54:56 djm Exp $
+$Id: ChangeLog,v 1.3858 2005/08/02 07:07:07 dtucker Exp $
diff --git a/hostfile.c b/hostfile.c
index bf2a31c9b..63550a29d 100644
--- a/hostfile.c
+++ b/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/scp.c b/scp.c
index 10c4b507c..1407aa71d 100644
--- a/scp.c
+++ b/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"
@@ -506,7 +506,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/sftp-client.c b/sftp-client.c
index e4f95b0e5..afbd1e6f3 100644
--- a/sftp-client.c
+++ b/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 "openbsd-compat/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;