suppressed cast to lvalue

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@559 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 9999268eaa0ffdd726051c15b228d0a1964707e5..f2970f88df75c74cdf3dfa328b1fd262efb9a48c 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -386,10 +386,12 @@ static unsigned long copy_strings(int argc,char ** argv,unsigned long *page,
            --p; --tmp; --len;
            if (--offset < 0) {
                offset = p % TARGET_PAGE_SIZE;
-               if (!(pag = (char *) page[p/TARGET_PAGE_SIZE]) &&
-                   !(pag = (char *) page[p/TARGET_PAGE_SIZE] =
-                     (unsigned long *) get_free_page())) {
-                       return 0;
+                pag = (char *) page[p/TARGET_PAGE_SIZE];
+                if (!pag) {
+                    pag = (char *)get_free_page();
+                    page[p/TARGET_PAGE_SIZE] = (unsigned long)pag;
+                    if (!pag)
+                        return 0;
                }
            }
            if (len == 0 || offset == 0) {