Module Name: src
Committed By: pooka
Date: Thu Nov 11 18:45:09 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
help me if you can i'm gcc
and i do appreciate work'round-eee'e
help me, get my head out of the ground
won't you please, please help me?
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.72 src/sys/rump/librump/rumpvfs/rumpfs.c:1.73
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.72 Thu Nov 11 17:33:22 2010
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Thu Nov 11 18:45:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.72 2010/11/11 17:33:22 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.73 2010/11/11 18:45:09 pooka Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.72 2010/11/11 17:33:22 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.73 2010/11/11 18:45:09 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -1129,7 +1129,7 @@
struct uio *uio = ap->a_uio;
const int advice = IO_ADV_DECODE(ap->a_ioflag);
off_t chunk;
- int error;
+ int error = 0;
/* et op? */
if (rn->rn_flags & RUMPNODE_ET_PHONE_HOST)
@@ -1191,7 +1191,7 @@
void *olddata;
size_t oldlen, newlen;
off_t chunk;
- int error;
+ int error = 0;
bool allocd = false;
/* consult et? */
@@ -1209,6 +1209,8 @@
* No, it doesn't really support sparse files, just fakes it.
*/
newlen = uio->uio_offset + uio->uio_resid;
+ oldlen = 0; /* XXXgcc */
+ olddata = NULL;
if (rn->rn_dlen < newlen) {
oldlen = rn->rn_dlen;
olddata = rn->rn_data;
