Revision 9678d950

b/console.c
829 829
    TextCell *c = &s->cells[y1 * s->width + x];
830 830
    c->ch = ' ';
831 831
    c->t_attrib = s->t_attrib_default;
832
    c++;
833 832
    update_xy(s, x, y);
834 833
}
835 834

  
b/hw/xen_disk.c
575 575
static int blk_init(struct XenDevice *xendev)
576 576
{
577 577
    struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
578
    int index, mode, qflags, have_barriers, info = 0;
578
    int index, qflags, have_barriers, info = 0;
579 579
    char *h;
580 580

  
581 581
    /* read xenstore entries */
......
609 609

  
610 610
    /* read-only ? */
611 611
    if (strcmp(blkdev->mode, "w") == 0) {
612
	mode   = O_RDWR;
613 612
	qflags = BDRV_O_RDWR;
614 613
    } else {
615
	mode   = O_RDONLY;
616 614
	qflags = 0;
617 615
	info  |= VDISK_READONLY;
618 616
    }
b/net/tap.c
346 346
        parg = args;
347 347
        *parg++ = (char *)setup_script;
348 348
        *parg++ = (char *)ifname;
349
        *parg++ = NULL;
349
        *parg = NULL;
350 350
        execv(setup_script, args);
351 351
        _exit(1);
352 352
    } else if (pid > 0) {
b/slirp/cksum.c
110 110
	if (byte_swapped) {
111 111
		REDUCE;
112 112
		sum <<= 8;
113
		byte_swapped = 0;
114 113
		if (mlen == -1) {
115 114
			s_util.c[1] = *(u_int8_t *)w;
116 115
			sum += s_util.s;
b/tcg/tcg.c
550 550
void tcg_gen_callN(TCGContext *s, TCGv_ptr func, unsigned int flags,
551 551
                   int sizemask, TCGArg ret, int nargs, TCGArg *args)
552 552
{
553
#ifdef TCG_TARGET_I386
553 554
    int call_type;
555
#endif
554 556
    int i;
555 557
    int real_args;
556 558
    int nb_rets;
557 559
    TCGArg *nparam;
558 560
    *gen_opc_ptr++ = INDEX_op_call;
559 561
    nparam = gen_opparam_ptr++;
562
#ifdef TCG_TARGET_I386
560 563
    call_type = (flags & TCG_CALL_TYPE_MASK);
564
#endif
561 565
    if (ret != TCG_CALL_DUMMY_ARG) {
562 566
#if TCG_TARGET_REG_BITS < 64
563 567
        if (sizemask & 1) {
b/vnc.c
1234 1234
 */
1235 1235
void vnc_client_write(void *opaque)
1236 1236
{
1237
    long ret;
1238 1237
    VncState *vs = opaque;
1239 1238

  
1240 1239
#ifdef CONFIG_VNC_SASL
1241 1240
    if (vs->sasl.conn &&
1242 1241
        vs->sasl.runSSF &&
1243
        !vs->sasl.waitWriteSSF)
1244
        ret = vnc_client_write_sasl(vs);
1245
    else
1242
        !vs->sasl.waitWriteSSF) {
1243
        vnc_client_write_sasl(vs);
1244
    } else
1246 1245
#endif /* CONFIG_VNC_SASL */
1247
        ret = vnc_client_write_plain(vs);
1246
        vnc_client_write_plain(vs);
1248 1247
}
1249 1248

  
1250 1249
void vnc_read_when(VncState *vs, VncReadEvent *func, size_t expecting)
......
1725 1724
                                       int x_position, int y_position,
1726 1725
                                       int w, int h)
1727 1726
{
1728
    if (x_position > ds_get_width(vs->ds))
1729
        x_position = ds_get_width(vs->ds);
1730 1727
    if (y_position > ds_get_height(vs->ds))
1731 1728
        y_position = ds_get_height(vs->ds);
1732
    if (x_position + w >= ds_get_width(vs->ds))
1733
        w = ds_get_width(vs->ds)  - x_position;
1734 1729
    if (y_position + h >= ds_get_height(vs->ds))
1735 1730
        h = ds_get_height(vs->ds) - y_position;
1736 1731

  

Also available in: Unified diff