Changeset 3488
- Timestamp:
- 08/13/07 17:09:52 (1 year ago)
- Files:
-
- branches/common-nfo/tools/nfotiser/nfotiser.h (modified) (2 diffs)
- branches/common-nfo/tools/nfotiser/pfile.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/common-nfo/tools/nfotiser/nfotiser.h
r3487 r3488 28 28 29 29 enum parser_argtype { 30 ARGT_INVALID, 30 31 ARGT_STRING, 31 32 ARGT_INTEGER … … 72 73 char *varnameck(const char *, const char *); 73 74 char *parse_fmt(parser_kwords, enum parser_kwtype, char *, unsigned, int); 75 char *parse_fms(const char *, struct parser_res *); 74 76 __END_DECLS 75 77 branches/common-nfo/tools/nfotiser/pfile.c
r3487 r3488 117 117 { "USERS", K_USERS, KWT_NORMAL, ARGT_STRING }, 118 118 { "VERSION", K_VERSION, KWT_NORMAL, ARGT_STRING }, 119 { NULL, 0, 0, 0}119 { NULL, KX_INVALID, KWT_INVALID, ARGT_INVALID } 120 120 }; 121 121 … … 171 171 } 172 172 173 static struct defaultvalue { 174 parser_kwords prefix; 175 enum parser_kwtype type; 176 const char *fmt; 177 } defaultvalues[] = { 178 { K_BROKEN, KWT_NORMAL, "n" }, 179 { K_DASHVER, KWT_NORMAL, "1" }, 180 { KX_INVALID, KWT_INVALID, NULL } 181 }; 182 173 183 static void 174 184 do_defaultvalues(struct parser_result *head) 175 185 { 176 /* ENOCOFFEE */; 186 struct parser_res *entry, *evar; 187 188 /* we only do some expansion here, not yet checking for required */ 189 177 190 } 178 191 … … 354 367 return (NULL); 355 368 } 369 370 char * 371 parse_fms(const char *fmt, struct parser_res *entry) 372 { 373 if (entry == NULL) 374 return (NULL); 375 return (xasprintf(fmt, entry->kw_multi, entry->kw_iter)); 376 }


