- { NOTMUCH_OPT_INT, &int_val, "int", 'i', 0},
- { NOTMUCH_OPT_STRING, &string_val, "string", 's', 0},
- { NOTMUCH_OPT_POSITION, &pos_arg1, 0,0, 0},
- { NOTMUCH_OPT_POSITION, &pos_arg2, 0,0, 0},
- { 0, 0, 0, 0, 0 } };
+ { .opt_int = &int_val, .name = "int", .present = &int_set },
+ { }
+ };
+
+ notmuch_opt_desc_t options[] = {
+ { .opt_bool = &bool_val, .name = "boolean", .present = &bool_set },
+ { .opt_keyword = &kw_val, .name = "keyword", .present = &kw_set, .keywords =
+ (notmuch_keyword_t []){ { "zero", 0 },
+ { "one", 1 },
+ { "two", 2 },
+ { 0, 0 } } },
+ { .opt_inherit = parent_options },
+ { .opt_string = &string_val, .name = "string", .present = &string_set },
+ { .opt_position = &pos_arg1, .present = &pos1_set },
+ { .opt_position = &pos_arg2, .present = &pos2_set },
+ { }
+ };