← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to qemu-io.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu-io.c
210
210
        int c, cnt;
211
211
        char *buf;
212
212
        int64_t offset;
213
 
        int count, total;
 
213
        int count;
 
214
        /* Some compilers get confused and warn if this is not initialized.  */
 
215
        int total = 0;
214
216
        int pattern = 0, pattern_offset = 0, pattern_count = 0;
215
217
 
216
218
        while ((c = getopt(argc, argv, "Cl:pP:qs:v")) != EOF) {
527
529
        int c, cnt;
528
530
        char *buf;
529
531
        int64_t offset;
530
 
        int count, total;
 
532
        int count;
 
533
        /* Some compilers get confused and warn if this is not initialized.  */
 
534
        int total = 0;
531
535
        int pattern = 0xcd;
532
536
 
533
537
        while ((c = getopt(argc, argv, "CpP:q")) != EOF) {