aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-27 22:16:47 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-27 22:16:47 +0000
commit54042bcf24b6c7c1c99f7a022f3cd00ba338f708 (patch)
tree4280b532a0261f13058153ecf3be557e2b625f77
parent0858532ea93e0890bf13556f4ef3dc25d7636233 (diff)
Remove some warnings and fix windows build.
Initialize some variables to make GCC happy and switch from using index to strchr. index is not available on Windows. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6653 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/acpi.c4
-rw-r--r--vl.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/acpi.c b/hw/acpi.c
index 52bc43ad5..52f50a081 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -841,7 +841,7 @@ int acpi_table_add(const char *t)
f = buf;
while (buf[0]) {
struct stat s;
- char *n = index(f, ':');
+ char *n = strchr(f, ':');
if (n)
*n = '\0';
if(stat(f, &s) < 0) {
@@ -873,7 +873,7 @@ int acpi_table_add(const char *t)
while (buf[0]) {
struct stat s;
int fd;
- char *n = index(f, ':');
+ char *n = strchr(f, ':');
if (n)
*n = '\0';
fd = open(f, O_RDONLY);
diff --git a/vl.c b/vl.c
index 8e59cd8d7..1d96a313d 100644
--- a/vl.c
+++ b/vl.c
@@ -4641,8 +4641,8 @@ int main(int argc, char **argv, char **envp)
const char *pid_file = NULL;
int autostart;
const char *incoming = NULL;
- int fd;
- struct passwd *pwd;
+ int fd = 0;
+ struct passwd *pwd = NULL;
const char *chroot_dir = NULL;
const char *run_as = NULL;