gwj / at91sam9263 · Commits

Commit 54042bcf24b6c7c1c99f7a022f3cd00ba338f708

Authored by aliguori
1 parent 0858532e

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
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
hw/acpi.c
  View file @54042bc
... ... @@ -841,7 +841,7 @@ int acpi_table_add(const char *t)
841 841 f = buf;
842 842 while (buf[0]) {
843 843 struct stat s;
844   - char *n = index(f, ':');
  844 + char *n = strchr(f, ':');
845 845 if (n)
846 846 *n = '\0';
847 847 if(stat(f, &s) < 0) {
... ... @@ -873,7 +873,7 @@ int acpi_table_add(const char *t)
873 873 while (buf[0]) {
874 874 struct stat s;
875 875 int fd;
876   - char *n = index(f, ':');
  876 + char *n = strchr(f, ':');
877 877 if (n)
878 878 *n = '\0';
879 879 fd = open(f, O_RDONLY);
... ...
... ... @@ -4641,8 +4641,8 @@ int main(int argc, char **argv, char **envp)
4641 4641 const char *pid_file = NULL;
4642 4642 int autostart;
4643 4643 const char *incoming = NULL;
4644   - int fd;
4645   - struct passwd *pwd;
  4644 + int fd = 0;
  4645 + struct passwd *pwd = NULL;
4646 4646 const char *chroot_dir = NULL;
4647 4647 const char *run_as = NULL;
4648 4648  
... ...