Revision c1925484 monitor.c

b/monitor.c
1515 1515
    }
1516 1516
}
1517 1517

  
1518
static void do_wav_capture(Monitor *mon, const char *path,
1519
                           int has_freq, int freq,
1520
                           int has_bits, int bits,
1521
                           int has_channels, int nchannels)
1522
{
1518
static void do_wav_capture(Monitor *mon, const QDict *qdict)
1519
{
1520
    const char *path = qdict_get_str(qdict, "path");
1521
    int has_freq = qdict_haskey(qdict, "freq");
1522
    int freq = qdict_get_try_int(qdict, "freq", -1);
1523
    int has_bits = qdict_haskey(qdict, "bits");
1524
    int bits = qdict_get_try_int(qdict, "bits", -1);
1525
    int has_channels = qdict_haskey(qdict, "nchannels");
1526
    int nchannels = qdict_get_try_int(qdict, "nchannels", -1);
1523 1527
    CaptureState *s;
1524 1528

  
1525 1529
    s = qemu_mallocz (sizeof (*s));
......
2601 2605
    void *str_allocated[MAX_ARGS];
2602 2606
    void *args[MAX_ARGS];
2603 2607
    void (*handler_d)(Monitor *mon, const QDict *qdict);
2604
    void (*handler_7)(Monitor *mon, void *arg0, void *arg1, void *arg2,
2605
                      void *arg3, void *arg4, void *arg5, void *arg6);
2606 2608
    void (*handler_8)(Monitor *mon, void *arg0, void *arg1, void *arg2,
2607 2609
                      void *arg3, void *arg4, void *arg5, void *arg6,
2608 2610
                      void *arg7);
......
2891 2893
    case 4:
2892 2894
    case 5:
2893 2895
    case 6:
2896
    case 7:
2894 2897
        handler_d = cmd->handler;
2895 2898
        handler_d(mon, qdict);
2896 2899
        break;
2897
    case 7:
2898
        handler_7 = cmd->handler;
2899
        handler_7(mon, args[0], args[1], args[2], args[3], args[4], args[5],
2900
                  args[6]);
2901
        break;
2902 2900
    case 8:
2903 2901
        handler_8 = cmd->handler;
2904 2902
        handler_8(mon, args[0], args[1], args[2], args[3], args[4], args[5],

Also available in: Unified diff