| popt.h | popt.h | |||
|---|---|---|---|---|
| skipping to change at line 160 | skipping to change at line 160 | |||
| /*@owned@*/ | /*@owned@*/ | |||
| const char ** argv; /*!< (alias) args, must be free()abl e. */ | const char ** argv; /*!< (alias) args, must be free()abl e. */ | |||
| } * poptItem; | } * poptItem; | |||
| /*@=exporttype@*/ | /*@=exporttype@*/ | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * \name Auto-generated help/usage | * \name Auto-generated help/usage | |||
| */ | */ | |||
| /*@{*/ | /*@{*/ | |||
| #if !defined(N_) | ||||
| #define N_(foo) foo | ||||
| #endif | ||||
| /** | /** | |||
| * Empty table marker to enable displaying popt alias/exec options. | * Empty table marker to enable displaying popt alias/exec options. | |||
| */ | */ | |||
| /*@-exportvar@*/ | /*@-exportvar@*/ | |||
| /*@unchecked@*/ /*@observer@*/ | /*@unchecked@*/ /*@observer@*/ | |||
| extern struct poptOption poptAliasOptions[]; | extern struct poptOption poptAliasOptions[]; | |||
| /*@=exportvar@*/ | /*@=exportvar@*/ | |||
| #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptio ns, \ | #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptio ns, \ | |||
| 0, N_("Options implemented via popt alias/exec:"), N ULL }, | 0, "Options implemented via popt alias/exec:", NULL }, | |||
| /** | /** | |||
| * Auto help table options. | * Auto help table options. | |||
| */ | */ | |||
| /*@-exportvar@*/ | /*@-exportvar@*/ | |||
| /*@unchecked@*/ /*@observer@*/ | /*@unchecked@*/ /*@observer@*/ | |||
| extern struct poptOption poptHelpOptions[]; | extern struct poptOption poptHelpOptions[]; | |||
| /*@=exportvar@*/ | /*@=exportvar@*/ | |||
| /*@-exportvar@*/ | /*@-exportvar@*/ | |||
| /*@unchecked@*/ /*@observer@*/ | /*@unchecked@*/ /*@observer@*/ | |||
| extern struct poptOption * poptHelpOptionsI18N; | extern struct poptOption * poptHelpOptionsI18N; | |||
| /*@=exportvar@*/ | /*@=exportvar@*/ | |||
| #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions , \ | #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions , \ | |||
| 0, N_("Help options:"), NULL }, | 0, "Help options:", NULL }, | |||
| #define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL } | #define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL } | |||
| /*@}*/ | /*@}*/ | |||
| /** \ingroup popt | /** \ingroup popt | |||
| */ | */ | |||
| /*@-exporttype@*/ | /*@-exporttype@*/ | |||
| typedef /*@abstract@*/ struct poptContext_s * poptContext; | typedef /*@abstract@*/ struct poptContext_s * poptContext; | |||
| /*@=exporttype@*/ | /*@=exporttype@*/ | |||
| skipping to change at line 278 | skipping to change at line 274 | |||
| int poptGetNextOpt(/*@null@*/poptContext con) | int poptGetNextOpt(/*@null@*/poptContext con) | |||
| /*@globals fileSystem, internalState @*/ | /*@globals fileSystem, internalState @*/ | |||
| /*@modifies con, fileSystem, internalState @*/; | /*@modifies con, fileSystem, internalState @*/; | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * Return next option argument (if any). | * Return next option argument (if any). | |||
| * @param con context | * @param con context | |||
| * @return option argument, NULL if no argument is available | * @return option argument, NULL if no argument is available | |||
| */ | */ | |||
| /*@observer@*/ /*@null@*/ /*@unused@*/ | /*@observer@*/ /*@null@*/ /*@unused@*/ | |||
| const char * poptGetOptArg(/*@null@*/poptContext con) | char * poptGetOptArg(/*@null@*/poptContext con) | |||
| /*@modifies con @*/; | /*@modifies con @*/; | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * Return next argument. | * Return next argument. | |||
| * @param con context | * @param con context | |||
| * @return next argument, NULL if no argument is available | * @return next argument, NULL if no argument is available | |||
| */ | */ | |||
| /*@observer@*/ /*@null@*/ /*@unused@*/ | /*@observer@*/ /*@null@*/ /*@unused@*/ | |||
| const char * poptGetArg(/*@null@*/poptContext con) | const char * poptGetArg(/*@null@*/poptContext con) | |||
| /*@modifies con @*/; | /*@modifies con @*/; | |||
| skipping to change at line 493 | skipping to change at line 489 | |||
| /*@modifies con @*/; | /*@modifies con @*/; | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * Print detailed description of options. | * Print detailed description of options. | |||
| * @param con context | * @param con context | |||
| * @param fp ouput file handle | * @param fp ouput file handle | |||
| * @param flags (unused) | * @param flags (unused) | |||
| */ | */ | |||
| void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags) | void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags) | |||
| /*@globals fileSystem @*/ | /*@globals fileSystem @*/ | |||
| /*@modifies *fp, fileSystem @*/; | /*@modifies fp, fileSystem @*/; | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * Print terse description of options. | * Print terse description of options. | |||
| * @param con context | * @param con context | |||
| * @param fp ouput file handle | * @param fp ouput file handle | |||
| * @param flags (unused) | * @param flags (unused) | |||
| */ | */ | |||
| void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags) | void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags) | |||
| /*@globals fileSystem @*/ | /*@globals fileSystem @*/ | |||
| /*@modifies *fp, fileSystem @*/; | /*@modifies fp, fileSystem @*/; | |||
| /** \ingroup popt | /** \ingroup popt | |||
| * Provide text to replace default "[OPTION...]" in help/usage output. | * Provide text to replace default "[OPTION...]" in help/usage output. | |||
| * @param con context | * @param con context | |||
| * @param text replacement text | * @param text replacement text | |||
| */ | */ | |||
| /*@-fcnuse@*/ | /*@-fcnuse@*/ | |||
| void poptSetOtherOptionHelp(poptContext con, const char * text) | void poptSetOtherOptionHelp(poptContext con, const char * text) | |||
| /*@modifies con @*/; | /*@modifies con @*/; | |||
| /*@=fcnuse@*/ | /*@=fcnuse@*/ | |||
| End of changes. 6 change blocks. | ||||
| 9 lines changed or deleted | 5 lines changed or added | |||