# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305296021 10800 # Node ID f92b5e72f469539bfdf449dbdb827075b3257cc5 # Parent f86d75144f5a932e886153584d1d7e084f9d1131 libcmpiutil: Remove warnings Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/eo_util_lexer.l b/eo_util_lexer.l --- a/eo_util_lexer.l +++ b/eo_util_lexer.l @@ -17,6 +17,8 @@ #ifndef YY_FLEX_LEX_COMPAT int eolineno = 1; #endif + +void eo_parse_error(char *errmsg); %} DIGIT ([0-9]) diff --git a/eo_util_parser.y b/eo_util_parser.y --- a/eo_util_parser.y +++ b/eo_util_parser.y @@ -118,7 +118,6 @@ | PROPERTYNAME '=' INTEGER ';' { EOTRACE("propertyname = %s\n", $1); - int rc; CMPIType t = set_int_prop($3, $1, *_INSTANCE); EOTRACE("\ttype = %d\n" "\tvalue = %lld\n", t, $3);

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305296515 10800 # Node ID af2ffd311f1bc510a56a7018691edce7be89ad17 # Parent f92b5e72f469539bfdf449dbdb827075b3257cc5 libcmpiutil: Cleanup includes This is a cosmetic patch removing some unecessary includes and 'standardizing' includes in the source code following the simple rules: 1) Internal includes (provided by libcmpiutil) are done with "" e.g. #include "libcmpiutil.h" 2) External includes (provided by other projects) are done with <> e.g. #include <cmpidt.h> Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/args_util.c b/args_util.c --- a/args_util.c +++ b/args_util.c @@ -24,8 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#include <cmpidt.h> -#include <cmpift.h> #include <cmpimacs.h> #include "libcmpiutil.h" diff --git a/debug_util.c b/debug_util.c --- a/debug_util.c +++ b/debug_util.c @@ -24,10 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#include <cmpidt.h> -#include <cmpift.h> -#include <cmpimacs.h> - #include "libcmpiutil.h" static int log_init = 0; diff --git a/eo_parser.c b/eo_parser.c --- a/eo_parser.c +++ b/eo_parser.c @@ -27,7 +27,7 @@ #include <fcntl.h> #include <unistd.h> -#include "cmpidt.h" +#include <cmpimacs.h> #include "libcmpiutil.h" #include "eo_util_parser.h" diff --git a/eo_parser_xml.c b/eo_parser_xml.c --- a/eo_parser_xml.c +++ b/eo_parser_xml.c @@ -28,8 +28,6 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <cmpidt.h> -#include <cmpift.h> #include <cmpimacs.h> #include "libcmpiutil.h" diff --git a/eo_util_lexer.l b/eo_util_lexer.l --- a/eo_util_lexer.l +++ b/eo_util_lexer.l @@ -11,7 +11,7 @@ /* DEFINITIONS SECTION */ %{ -#include "cmpidt.h" +#include <cmpidt.h> #include <string.h> #include "eo_util_parser.h" #ifndef YY_FLEX_LEX_COMPAT diff --git a/eo_util_parser.y b/eo_util_parser.y --- a/eo_util_parser.y +++ b/eo_util_parser.y @@ -13,8 +13,8 @@ #include <stdio.h> #include <stdint.h> -#include "cmpidt.h" -#include "cmpift.h" +#include <cmpidt.h> +#include <cmpift.h> #include "eo_parser_xml.h" diff --git a/inst_list.c b/inst_list.c --- a/inst_list.c +++ b/inst_list.c @@ -20,9 +20,7 @@ */ #include <stdlib.h> -#include <cmpidt.h> - -#include <libcmpiutil.h> +#include "libcmpiutil.h" static int resize(struct inst_list *list, int newmax) { diff --git a/instance_util.c b/instance_util.c --- a/instance_util.c +++ b/instance_util.c @@ -18,9 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdbool.h> #include <string.h> +#include <cmpimacs.h> + #include "libcmpiutil.h" unsigned int cu_return_instances(const CMPIResult *results, diff --git a/libcmpiutil.h b/libcmpiutil.h --- a/libcmpiutil.h +++ b/libcmpiutil.h @@ -12,12 +12,8 @@ #include <stdbool.h> #include <stdint.h> -#include <stdlib.h> -#include <stdio.h> #include <cmpidt.h> -#include <cmpift.h> -#include <cmpimacs.h> #define CLASSNAME(op) (CMGetCharPtr(CMGetClassName(op, NULL))) #define NAMESPACE(op) (CMGetCharPtr(CMGetNameSpace(op, NULL))) diff --git a/std_association.c b/std_association.c --- a/std_association.c +++ b/std_association.c @@ -22,10 +22,6 @@ */ #include <string.h> -#include <cmpidt.h> -#include <cmpift.h> -#include <cmpimacs.h> - #include "libcmpiutil.h" #include "std_association.h" diff --git a/std_association.h b/std_association.h --- a/std_association.h +++ b/std_association.h @@ -23,6 +23,7 @@ #define __STD_ASSOCIATION_H #include <cmpidt.h> +#include <cmpift.h> struct std_assoc; struct std_assoc_info; diff --git a/std_indication.c b/std_indication.c --- a/std_indication.c +++ b/std_indication.c @@ -20,12 +20,9 @@ */ #include <string.h> #include <stdbool.h> +#include <stdlib.h> -#include <cmpidt.h> -#include <cmpift.h> -#include <cmpimacs.h> - -#include <libcmpiutil.h> +#include "libcmpiutil.h" #define STREQ(a, b) (strcmp(a, b) == 0) #define STREQC(a, b) (strcasecmp(a, b) == 0) diff --git a/std_indication.h b/std_indication.h --- a/std_indication.h +++ b/std_indication.h @@ -21,15 +21,10 @@ #ifndef __STD_INDICATION_H #define __STD_INDICATION_H +#include <stdbool.h> + #include <cmpidt.h> #include <cmpift.h> -#include <cmpimacs.h> -#include <stdio.h> - -#include "config.h" - -#include "libcmpiutil.h" -#include "std_invokemethod.h" #ifdef CMPI_EI_VOID # define _EI_RTYPE void diff --git a/std_invokemethod.c b/std_invokemethod.c --- a/std_invokemethod.c +++ b/std_invokemethod.c @@ -21,10 +21,6 @@ #include <stdio.h> #include <string.h> -#include "cmpidt.h" -#include "cmpift.h" -#include "cmpimacs.h" - #include "libcmpiutil.h" #include "std_invokemethod.h" diff --git a/std_invokemethod.h b/std_invokemethod.h --- a/std_invokemethod.h +++ b/std_invokemethod.h @@ -21,9 +21,8 @@ #ifndef __STD_INVOKEMETHOD_H #define __STD_INVOKEMETHOD_H -#include "cmpidt.h" -#include "cmpift.h" -#include "cmpimacs.h" +#include <cmpidt.h> +#include <cmpift.h> typedef CMPIStatus (*method_handler_fn)(CMPIMethodMI *self, const CMPIContext *context,

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305296777 10800 # Node ID 71c08398356cf6cdcef25acb7132518d8fc2a5ee # Parent af2ffd311f1bc510a56a7018691edce7be89ad17 libcmpituil: Configure tweaks acinclude.m4 - Better output when checking for CMPI includes configure.ac - Use automake silent rules if available - Check for pkg-config program Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -42,6 +42,7 @@ dnl The standard include paths worked. AC_MSG_RESULT(yes) else + AC_MSG_RESULT(no) _DIRS_="/usr/include/cmpi \ /usr/local/include/cmpi \ $PEGASUS_ROOT/src/Pegasus/Provider/CMPI \ @@ -61,13 +62,15 @@ dnl Save the new -I parameter CMPI_CPP_FLAGS="$CPPFLAGS" break - fi + else + AC_MSG_RESULT(no) + fi CPPFLAGS=$_cppflags done fi CPPFLAGS="$CMPI_CPP_FLAGS" if test "$have_CMPI" == "no"; then - AC_MSG_ERROR(no. Sorry cannot find CMPI headers files.) + AC_MSG_ERROR(Cannot find CMPI header files.) fi ] ) diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,9 @@ AC_CONFIG_FILES([Makefile tools/Makefile]) +# Use silent-rules if possible AM_INIT_AUTOMAKE +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC @@ -51,6 +53,8 @@ AM_CONDITIONAL([build_eoparser],[test x$eoparser = xyes]) +# Check for pkg-config program +PKG_PROG_PKG_CONFIG CHECK_LIBXML2 if test x${eoparser} = xyes; then

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305296806 10800 # Node ID c24bb1e158f5fee7e5e51e42fa02790f58ce2834 # Parent 71c08398356cf6cdcef25acb7132518d8fc2a5ee libcmpiutil: Update .hgignore Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -18,3 +18,8 @@ .*~$ ^\.libs/.* .*\.la$ +.*\.pc$ +.*\.spec$ +ylwrap +.*\.tar.bz2$ +.*\.tar.gz$

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305297352 10800 # Node ID 1177a2ffc8c7333a8e80c7ce743f0f10ef7da99c # Parent c24bb1e158f5fee7e5e51e42fa02790f58ce2834 libcmpiutil: Remove trailing whitespaces Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ BUILT_SOURCES = eo_util_lexer.c eo_util_parser.c eo_util_parser.h endif -lib_LTLIBRARIES = $(EOPARSER) libcmpiutil.la +lib_LTLIBRARIES = $(EOPARSER) libcmpiutil.la docs: if found_doxygen diff --git a/acinclude.m4 b/acinclude.m4 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -59,7 +59,7 @@ if test "$have_CMPI" == "yes"; then dnl Found it AC_MSG_RESULT(yes) - dnl Save the new -I parameter + dnl Save the new -I parameter CMPI_CPP_FLAGS="$CPPFLAGS" break else @@ -67,8 +67,8 @@ fi CPPFLAGS=$_cppflags done - fi - CPPFLAGS="$CMPI_CPP_FLAGS" + fi + CPPFLAGS="$CMPI_CPP_FLAGS" if test "$have_CMPI" == "no"; then AC_MSG_ERROR(Cannot find CMPI header files.) fi @@ -100,7 +100,7 @@ # AC_DEFUN([CHECK_IND_VOID], [ AH_TEMPLATE([CMPI_EI_VOID], - [Defined if return type of EnableIndications + [Defined if return type of EnableIndications should be void]) AC_MSG_CHECKING([return type for indications]) CFLAGS_TMP=$CFLAGS @@ -110,7 +110,7 @@ static void ei(CMPIIndicationMI *mi, const CMPIContext *c) { return; } - ],[ + ],[ struct _CMPIIndicationMIFT ft; ft.enableIndications = ei; return 0; diff --git a/args_util.c b/args_util.c --- a/args_util.c +++ b/args_util.c @@ -37,10 +37,10 @@ CMPIData data; CMPIStatus s; const char *value; - + data = CMGetKey(reference, key, &s); - if ((s.rc != CMPI_RC_OK) || - CMIsNullValue(data) || + if ((s.rc != CMPI_RC_OK) || + CMIsNullValue(data) || CMIsNullObject(data.value.string)) return CMPI_RC_ERR_FAILED; @@ -96,7 +96,7 @@ if ((s.rc != CMPI_RC_OK) || (CMIsNullValue(argdata))) return CMPI_RC_ERR_INVALID_PARAMETER; - if ((argdata.type != CMPI_string) || + if ((argdata.type != CMPI_string) || CMIsNullObject(argdata.value.string)) return CMPI_RC_ERR_TYPE_MISMATCH; @@ -150,7 +150,7 @@ { CMPIData argdata; CMPIStatus s; - + argdata = CMGetArg(args, name, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullValue(argdata)) return CMPI_RC_ERR_INVALID_PARAMETER; @@ -221,7 +221,7 @@ const char *prop_val; *target = NULL; - + REQUIRE_PROPERTY_DEFINED(inst, prop, value, &s); if (value.type != CMPI_string) diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,7 @@ [eoparser=${enableval}], [eoparser=yes]) -AM_CONDITIONAL([build_eoparser],[test x$eoparser = xyes]) +AM_CONDITIONAL([build_eoparser],[test x$eoparser = xyes]) # Check for pkg-config program PKG_PROG_PKG_CONFIG diff --git a/debug_util.c b/debug_util.c --- a/debug_util.c +++ b/debug_util.c @@ -51,7 +51,7 @@ if (log != NULL) vfprintf(log, fmt, ap); - + va_end(ap); } diff --git a/doc/doxygen.conf b/doc/doxygen.conf --- a/doc/doxygen.conf +++ b/doc/doxygen.conf @@ -14,207 +14,207 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = libcmpiutil -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = 1 -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = doc -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, +# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, +# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, +# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, # Swedish, and Ukrainian. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for # all platforms other than Windows). USE_WINDOWS_ENCODING = NO -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an # explicit @brief command for a brief description. JAVADOC_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = YES -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES @@ -223,327 +223,327 @@ # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = NO -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command <command> <input-file>, where <command> is the value of -# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = . ./doc/mainpage -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py #FILE_PATTERNS = *.c *.h doc/mainpage -FILE_PATTERNS = +FILE_PATTERNS = -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = NO -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command <filter> <input-file>, where <filter> -# is the value of the INPUT_FILTER tag, and <input-file> is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -552,32 +552,32 @@ # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES (the default) +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -589,16 +589,16 @@ REFERENCES_LINK_SOURCE = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -607,133 +607,133 @@ # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# generated containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 @@ -742,74 +742,74 @@ # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO @@ -818,68 +818,68 @@ # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -888,33 +888,33 @@ # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -923,10 +923,10 @@ # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -935,319 +935,319 @@ # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = NO -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected # functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected # functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very # large images. MAX_DOT_GRAPH_WIDTH = 1024 -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very # large images. MAX_DOT_GRAPH_HEIGHT = 1024 -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that a graph may be further truncated if the graph's -# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH -# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that a graph may be further truncated if the graph's +# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH +# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), # the graph is not depth-constrained. MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to # read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- -# The SEARCHENGINE tag specifies whether or not a search engine should be +# The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = NO diff --git a/doc/mainpage b/doc/mainpage --- a/doc/mainpage +++ b/doc/mainpage @@ -2,5 +2,5 @@ \mainpage Documentation for libcmpiutil Browse the interface headers in the "Files" tab above - + */ diff --git a/eo_parser.c b/eo_parser.c --- a/eo_parser.c +++ b/eo_parser.c @@ -115,16 +115,16 @@ CMPIStatus s; uint64_t unsigned_val = 0; int64_t signed_val = 0; - + switch(type) { case CMPI_uint64: case CMPI_uint32: case CMPI_uint16: case CMPI_uint8: unsigned_val = (uint64_t) value; - s = CMSetProperty(inst, - prop, - (CMPIValue *) &(unsigned_val), + s = CMSetProperty(inst, + prop, + (CMPIValue *) &(unsigned_val), type); break; case CMPI_sint64: @@ -133,9 +133,9 @@ case CMPI_sint8: default: signed_val = (int64_t) value; - s = CMSetProperty(inst, - prop, - (CMPIValue *) &(signed_val), + s = CMSetProperty(inst, + prop, + (CMPIValue *) &(signed_val), type); } @@ -151,17 +151,17 @@ { if (_set_int_prop(value, prop, CMPI_uint64, inst) == 1) return CMPI_uint64; - else if (_set_int_prop(value, prop, CMPI_uint32, inst) == 1) + else if (_set_int_prop(value, prop, CMPI_uint32, inst) == 1) return CMPI_uint32; - else if (_set_int_prop(value, prop, CMPI_uint16, inst) == 1) + else if (_set_int_prop(value, prop, CMPI_uint16, inst) == 1) return CMPI_uint16; else if (_set_int_prop(value, prop, CMPI_uint8, inst) == 1) return CMPI_uint8; else if (_set_int_prop(value, prop, CMPI_sint64, inst) == 1) return CMPI_sint64; - else if (_set_int_prop(value, prop, CMPI_sint32, inst) == 1) + else if (_set_int_prop(value, prop, CMPI_sint32, inst) == 1) return CMPI_sint32; - else if (_set_int_prop(value, prop, CMPI_sint16, inst) == 1) + else if (_set_int_prop(value, prop, CMPI_sint16, inst) == 1) return CMPI_sint16; else _set_int_prop(value, prop, CMPI_sint8, inst); @@ -176,7 +176,7 @@ { CMPIString *cm_str; CMPIStatus s = {CMPI_RC_OK, NULL}; - + cm_str = CMNewString(broker, str, &s); if (s.rc != CMPI_RC_OK || CMIsNullObject(cm_str)) { CU_DEBUG("Error creating CMPIString"); diff --git a/eo_util_lexer.l b/eo_util_lexer.l --- a/eo_util_lexer.l +++ b/eo_util_lexer.l @@ -35,11 +35,11 @@ QUOTEDTEXT (\"[^"\n]*["\n]) SINGLEQUOTEDTEXT (\'[^'\n]*['\n]) FILENAME ([A-Za-z0-9\.][A-Za-z0-9\.\-\+\_]*) -PATHNAME (\/?[A-Za-z0-9\.][A-Za-z0-9\.\-\+\_]*(\/[A-Za-z0-9\.][A-Za-z0-9\.\-\+\_]*)*\/?) -HOSTNAME ([A-Za-z][A-Za-z0-9\-\_]*(\.[A-Za-z][A-Za-z0-9\-\_]*)*) +PATHNAME (\/?[A-Za-z0-9\.][A-Za-z0-9\.\-\+\_]*(\/[A-Za-z0-9\.][A-Za-z0-9\.\-\+\_]*)*\/?) +HOSTNAME ([A-Za-z][A-Za-z0-9\-\_]*(\.[A-Za-z][A-Za-z0-9\-\_]*)*) IPADDR ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+) - /* Special mode to read CLASSNAME after reading INSTANCE OF, + /* Special mode to read CLASSNAME after reading INSTANCE OF, * otherwise cannot distinguish this token from a PROPERTYNAME */ %x READCLASSNAME @@ -143,7 +143,7 @@ void eo_parse_error(char *errmsg) { - fprintf(stderr, "error line %d: %s in '%s'\n", + fprintf(stderr, "error line %d: %s in '%s'\n", eolineno, errmsg, eo_parse_text); } diff --git a/eo_util_parser.y b/eo_util_parser.y --- a/eo_util_parser.y +++ b/eo_util_parser.y @@ -117,10 +117,10 @@ | PROPERTYNAME '=' INTEGER ';' { - EOTRACE("propertyname = %s\n", $1); + EOTRACE("propertyname = %s\n", $1); CMPIType t = set_int_prop($3, $1, *_INSTANCE); EOTRACE("\ttype = %d\n" - "\tvalue = %lld\n", t, $3); + "\tvalue = %lld\n", t, $3); free($1); } @@ -133,7 +133,7 @@ CMSetProperty(*_INSTANCE, $1, &($3), CMPI_boolean); free($1); } - | PROPERTYNAME '=' OPENBRACKET + | PROPERTYNAME '=' OPENBRACKET { EOTRACE("propertyname = %s\n" "\ttype = CMPI_charsA\n", @@ -142,8 +142,8 @@ stringarraysize = 0; stringarraypropname = $1; } - arrayofstrings CLOSEBRACKET ';' - + arrayofstrings CLOSEBRACKET ';' + | PROPERTYNAME '=' CIMNULL ';' { EOTRACE("propertyname = %s\n" @@ -152,38 +152,38 @@ } ; -arrayofstrings: STRING +arrayofstrings: STRING { - EOTRACE("\t%s[%u]=%s\n", - propertyname, - stringarraysize, + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, $1); stringarraysize++; - stringarray = (char **)realloc(stringarray, - sizeof(char *) * + stringarray = (char **)realloc(stringarray, + sizeof(char *) * stringarraysize); stringarray[stringarraysize-1] = $1; } COMMA arrayofstrings - + | STRING { CMPIArray *arr; CMPICount i; CMPIStatus s = {CMPI_RC_OK, NULL}; - - EOTRACE("\t%s[%u]=%s\n", - propertyname, - stringarraysize, + + EOTRACE("\t%s[%u]=%s\n", + propertyname, + stringarraysize, $1); - + stringarraysize++; - arr = CMNewArray(_BROKER, - stringarraysize, - CMPI_string, + arr = CMNewArray(_BROKER, + stringarraysize, + CMPI_string, &s); if (s.rc != CMPI_RC_OK || CMIsNullObject(arr)) { EOTRACE("Error creating array\n"); @@ -200,19 +200,19 @@ if (s.rc != CMPI_RC_OK) goto str_arr_out; } - - s = ins_chars_into_cmstr_arr(_BROKER, - arr, + + s = ins_chars_into_cmstr_arr(_BROKER, + arr, stringarraysize - 1, $1); if (s.rc != CMPI_RC_OK) goto str_arr_out; - CMSetProperty(*_INSTANCE, + CMSetProperty(*_INSTANCE, stringarraypropname, &arr, CMPI_stringA); - + str_arr_out: free(stringarraypropname); for (i = 0; i < stringarraysize - 1; i++) @@ -220,9 +220,9 @@ free($1); if (s.rc != CMPI_RC_OK) { - return RC_ARR_CREAT_FAILED; + return RC_ARR_CREAT_FAILED; } - + } ; diff --git a/instance_util.c b/instance_util.c --- a/instance_util.c +++ b/instance_util.c @@ -92,15 +92,15 @@ { const char *ref_cn; const char *op_cn; - + ref_cn = CLASSNAME(ref); if (ref_cn == NULL) return false; - + op_cn = CLASSNAME(op); if (op_cn == NULL) return false; - + return STREQC(op_cn, ref_cn); } @@ -108,7 +108,7 @@ const CMPIInstance *inst) { CMPIStatus s = {CMPI_RC_OK, NULL}; - CMPIObjectPath *op; + CMPIObjectPath *op; const char *prop = NULL; int i; int count; @@ -119,14 +119,14 @@ if (!_compare_classname(ref, op)) return "CreationClassName"; - + count = CMGetKeyCount(op, &s); if (s.rc != CMPI_RC_OK) { CU_DEBUG("Unable to get key count"); return NULL; } CU_DEBUG("Number of keys: %i", count); - + for (i = 0; i < count; i++) { CMPIData kd, pd; CMPIString *str; @@ -163,14 +163,14 @@ { CMPIStatus s = {CMPI_RC_OK, NULL}; const char *prop; - + prop = cu_compare_ref(ref, inst); if (prop != NULL) { cu_statusf(broker, &s, CMPI_RC_ERR_NOT_FOUND, "No such instance (%s)", prop); } - + return s; } @@ -182,7 +182,7 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; if (src_name == NULL) { - cu_statusf(broker, &s, + cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, "No property name given"); goto out; @@ -193,7 +193,7 @@ data = CMGetProperty(src_inst, src_name, &s); if (s.rc != CMPI_RC_OK || CMIsNullValue(data)) { - cu_statusf(broker, &s, + cu_statusf(broker, &s, CMPI_RC_ERR_FAILED, "Copy failed. Could not get prop '%s'.", src_name); goto out; @@ -202,7 +202,7 @@ CMSetProperty(dest_inst, dest_name, &(data.value), data.type); out: - return s; + return s; } CMPIInstance *cu_dup_instance(const CMPIBroker *broker, @@ -222,7 +222,7 @@ "Could not get objectpath from instance"); goto out; } - + dest = CMNewInstance(broker, ref, s); prop_count = CMGetPropertyCount(src, s); @@ -242,8 +242,8 @@ if (s->rc != CMPI_RC_OK) { goto out; } - - *s = CMSetProperty(dest, prop_name, + + *s = CMSetProperty(dest, prop_name, &(data.value), data.type); if (s->rc != CMPI_RC_OK) { goto out; @@ -302,7 +302,7 @@ ref = CMGetObjectPath(inst, NULL); if (CMIsNullObject(ref)) goto out; - + ret = CLASSNAME(ref); out: diff --git a/libcmpiutil.h b/libcmpiutil.h --- a/libcmpiutil.h +++ b/libcmpiutil.h @@ -44,7 +44,7 @@ #define CU_STRINGIFY(x) _CU_STRINGIFY(x) /** - * Dispatch macro for debug_print, fills in the function name and line number + * Dispatch macro for debug_print, fills in the function name and line number * of caller. */ #define CU_DEBUG(fmt, args...) { \ @@ -60,7 +60,7 @@ void debug_print(char *fmt, ...); /** - * Copies a property from one CMPIInstance to another. If dest_name is NULL, + * Copies a property from one CMPIInstance to another. If dest_name is NULL, * it is assumed to be the same as src_name. * * @param broker CIM broker, needed for status calls @@ -69,7 +69,7 @@ * @param src_name Name of property to be copied from src_inst * @param dest_name Name of property to be copied to dest_inst */ -CMPIStatus cu_copy_prop(const CMPIBroker *broker, +CMPIStatus cu_copy_prop(const CMPIBroker *broker, CMPIInstance *src_inst, CMPIInstance *dest_inst, char *src_name, char *dest_name); @@ -167,7 +167,7 @@ * * @param src Source instance * @param dest Destination instance - * @returns {CMPI_RC_OK, NULL} if success, CMPI_RC ERR_FAILED and + * @returns {CMPI_RC_OK, NULL} if success, CMPI_RC ERR_FAILED and * error message otherwise */ CMPIStatus cu_merge_instances(CMPIInstance *src, @@ -178,7 +178,7 @@ * * @param src Source instance * @param dest Destination instance - * @returns {CMPI_RC_OK, NULL} if success, CMPI_RC ERR_FAILED and + * @returns {CMPI_RC_OK, NULL} if success, CMPI_RC ERR_FAILED and * error message otherwise */ CMPIInstance *cu_dup_instance(const CMPIBroker *broker, @@ -226,8 +226,8 @@ * @param prop The property name * @param target A pointer to a CMPIarray that will be set * if successful - * @returns - * - CMPI_RC_OK on success, + * @returns + * - CMPI_RC_OK on success, * - CMPI_RC_ERR_NO_SUCH_PROPERTY if prop is not present, * - CMPI_RC_ERR_TYPE_MISMATCH if prop is not an array, * - CMPI_RC_ERROR otherwise @@ -243,8 +243,8 @@ * @param prop The property name * @param target A pointer to a char* that will be set to a malloc'd string * if successful - * @returns - * - CMPI_RC_OK on success, + * @returns + * - CMPI_RC_OK on success, * - CMPI_RC_ERR_NO_SUCH_PROPERTY if prop is not present, * - CMPI_RC_ERR_TYPE_MISMATCH if prop is not a string, * - CMPI_RC_ERROR otherwise @@ -259,8 +259,8 @@ * @param inst The instance * @param prop The property name * @param target A pointer to a bool that will reflect the property status - * @returns - * - CMPI_RC_OK on success, + * @returns + * - CMPI_RC_OK on success, * - CMPI_RC_ERR_NO_SUCH_PROPERTY if prop is not present, * - CMPI_RC_ERR_TYPE_MISMATCH if prop is not a boolean, * - CMPI_RC_ERROR otherwise @@ -291,8 +291,8 @@ * @param inst The instance * @param prop The property name * @param target A pointer to a uint32_t that will reflect the property value - * @returns - * - CMPI_RC_OK on success, + * @returns + * - CMPI_RC_OK on success, * - CMPI_RC_ERR_NO_SUCH_PROPERTY if prop is not present, * - CMPI_RC_ERR_TYPE_MISMATCH if prop is not a uint32, * - CMPI_RC_ERROR otherwise @@ -307,8 +307,8 @@ * @param inst The instance * @param prop The property name * @param target A pointer to a uint64_t that will reflect the property value - * @returns - * - CMPI_RC_OK on success, + * @returns + * - CMPI_RC_OK on success, * - CMPI_RC_ERR_NO_SUCH_PROPERTY if prop is not present, * - CMPI_RC_ERR_TYPE_MISMATCH if prop is not a uint64, * - CMPI_RC_ERROR otherwise @@ -425,7 +425,7 @@ /** * Validate a client given reference against the system instance. - * This is done by comparing the key values of the reference + * This is done by comparing the key values of the reference * against the key properties found in the system instance. * * @param broker A pointer to the current broker @@ -440,7 +440,7 @@ const CMPIInstance *inst); /** - * Returns the classname from an instance without forcing user to get + * Returns the classname from an instance without forcing user to get * ObjectPath first. * * @param inst Instance to examine diff --git a/libcmpiutil.spec.in b/libcmpiutil.spec.in --- a/libcmpiutil.spec.in +++ b/libcmpiutil.spec.in @@ -20,7 +20,7 @@ The goal is to reduce the amount of repetitive work done in most CMPI providers by encapsulating common procedures with more "normal" APIs. This extends from operations like getting typed -instance properties to standardizing method dispatch and argument checking. +instance properties to standardizing method dispatch and argument checking. %package devel Summary: Libraries, includes, etc. to use the CMPI utility library @@ -34,7 +34,7 @@ The goal is to reduce the amount of repetitive work done in most CMPI providers by encapsulating common procedures with more "normal" APIs. This extends from operations like getting typed -instance properties to standardizing method dispatch and argument checking. +instance properties to standardizing method dispatch and argument checking. %prep %setup -q @@ -58,7 +58,7 @@ %postun -p /sbin/ldconfig -%files +%files %defattr(-, root, root, -) %doc doc/doxygen.conf doc/mainpage README COPYING diff --git a/std_association.c b/std_association.c --- a/std_association.c +++ b/std_association.c @@ -68,7 +68,7 @@ if (comp_class_list == NULL) return true; - + for (i = 0; comp_class_list[i]; i++) { comp_class = comp_class_list[i]; rop = CMNewObjectPath(broker, ns, comp_class, NULL); @@ -89,10 +89,10 @@ for (i = 0; ptr->source_class[i]; i++) { source_class = ptr->source_class[i]; - - if (CMClassPathIsA(broker, - ref, - source_class, + + if (CMClassPathIsA(broker, + ref, + source_class, NULL)) return true; } @@ -151,9 +151,9 @@ if (!match_source_class(ctx->brkr, ref, ptr)) { CU_DEBUG("Source class doesn't match"); - continue; + continue; } - + if (!ptr) { CU_DEBUG("Invalid pointer"); continue; @@ -162,50 +162,50 @@ if (info->assoc_class) { CU_DEBUG("Check client's assocClass: '%s'", info->assoc_class); - - rc = match_class(ctx->brkr, - NAMESPACE(ref), + + rc = match_class(ctx->brkr, + NAMESPACE(ref), info->assoc_class, ptr->assoc_class); - + if (!rc) { CU_DEBUG("AssocClass not valid."); continue; } CU_DEBUG("AssocClass valid."); } - + if (info->result_class) { CU_DEBUG("Check client's resultClass: '%s'", info->result_class); - - rc = match_class(ctx->brkr, - NAMESPACE(ref), - info->result_class, + + rc = match_class(ctx->brkr, + NAMESPACE(ref), + info->result_class, ptr->target_class); - + if (!rc) { CU_DEBUG("ResultClass not valid."); continue; } CU_DEBUG("ResultClass valid."); } - + if (info->role) { CU_DEBUG("Check client's role: '%s'", info->role); - + if (!STREQC(info->role, ptr->source_prop)) { CU_DEBUG("Invalid role"); continue; } CU_DEBUG("Role valid."); } - + if (info->result_role) { CU_DEBUG("Check client's resultRole: '%s'", info->result_role); - + if (!STREQC(info->result_role, ptr->target_prop)) { CU_DEBUG("ResultRole not valid."); continue; @@ -216,9 +216,9 @@ goto out; } - CU_DEBUG("No valid handler found"); + CU_DEBUG("No valid handler found"); ptr = NULL; - + out: return ptr; } @@ -240,11 +240,11 @@ for (i = 0; i < tmp_list.cur; i++) { CMPIInstance *refinst; - + refinst = handler->make_ref(ref, tmp_list.list[i], info, handler); if (refinst == NULL) continue; - + inst_list_add(list, refinst); } @@ -271,7 +271,7 @@ CU_DEBUG("filter_results did not return CMPI_RC_OK."); return s; } - + return s; } @@ -377,7 +377,7 @@ info, ref, &list); - + if (s.rc != CMPI_RC_OK) { CU_DEBUG("Prepare return list did not return CMPI_RC_OK."); goto out; diff --git a/std_association.h b/std_association.h --- a/std_association.h +++ b/std_association.h @@ -41,18 +41,18 @@ * std_assoc is the definition that the developer puts in their source file. It * defines an association relationship between a set of source and target * classes, through a named (set of) association classes and the function - * handler which does the work. - * It must be registered using the macro STDA_AssocMIStub. + * handler which does the work. + * It must be registered using the macro STDA_AssocMIStub. */ struct std_assoc { - /* Defines the list of possible classes that can be passed to the + /* Defines the list of possible classes that can be passed to the association for this case */ char **source_class; - - /* Defines the property of the association class that refers + + /* Defines the property of the association class that refers to the input (source class) of this case. This must match - that of the schema, and is used for automatic generation of + that of the schema, and is used for automatic generation of the reference object in the References() or ReferenceNames() operation */ char *source_prop; @@ -63,20 +63,20 @@ /* Same as source_prop, applied for target */ char *target_prop; - + /* Defines the list of association classes which are implemented by this handler */ char **assoc_class; /* Function handler responsible for doing the association and returning the list of target instances of the association. - The handler function receives the reference of the source - class of the association and must map it to a list of + The handler function receives the reference of the source + class of the association and must map it to a list of CMPIInstance objects (targets of the association). */ assoc_handler_t handler; /* Function handler responsible for creating an instance of the - association class. + association class. The handler function receives the source object path, and the target instance, so it can create the reference which is returned by the function. */ diff --git a/std_indication.c b/std_indication.c --- a/std_indication.c +++ b/std_indication.c @@ -49,7 +49,7 @@ break; } } - + if (filter == NULL) CU_DEBUG("get_ind_filter: failed to find %s", ind_name); @@ -76,7 +76,7 @@ "No std_ind_filter for %s", ind_name); goto out; } - + ret = filter->active; if (!ret) CU_DEBUG("Indication '%s' not in active filter", ind_name); @@ -101,12 +101,12 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; s = CMSetObjectPath(ind, ref); - if (s.rc != CMPI_RC_OK) + if (s.rc != CMPI_RC_OK) return s; CBDeliverIndication(broker, - context, - NAMESPACE(ref), + context, + NAMESPACE(ref), ind); return s; } @@ -209,7 +209,7 @@ "Provider has no indication '%s'", ind_name); goto out; } - + filter->active = state; out: @@ -226,7 +226,7 @@ CMPIStatus s = {CMPI_RC_OK, NULL}; struct std_indication_ctx *_ctx; const char *cn = NULL; - + _ctx = (struct std_indication_ctx *)mi->hdl; cn = CLASSNAME(op); s = stdi_set_ind_filter_state(_ctx, cn, true); @@ -397,7 +397,7 @@ return s; CBInvokeMethod(broker, context, op, method, argsin, argsout, &s); - + return s; } diff --git a/std_instance.h b/std_instance.h --- a/std_instance.h +++ b/std_instance.h @@ -24,11 +24,11 @@ #define __STD_INSTANCE_H /** - * Generates the function table and initialization stub for an + * Generates the function table and initialization stub for an * instance provider. - * @param pfx The prefix for all mandatory association provider + * @param pfx The prefix for all mandatory association provider * functions. - * @param pn The provider name under which this provider is + * @param pn The provider name under which this provider is * registered. * @param broker The CMPIBroker pointer. * @param hook Perform additional initialization functions. diff --git a/std_invokemethod.c b/std_invokemethod.c --- a/std_invokemethod.c +++ b/std_invokemethod.c @@ -70,7 +70,7 @@ return 0; } - return 1; + return 1; } static int parse_eo_array(CMPIArray *strings_in, @@ -168,9 +168,9 @@ return 1; } -static int validate_arg_type(struct method_arg *arg, +static int validate_arg_type(struct method_arg *arg, const CMPIArgs *args, - const CMPIBroker *broker, + const CMPIBroker *broker, const char *ns, CMPIArgs *new_args, CMPIStatus *s) @@ -228,7 +228,7 @@ return 1; } -static int validate_args(struct method_handler *h, +static int validate_args(struct method_handler *h, const CMPIArgs **args, const CMPIObjectPath *ref, const CMPIBroker *broker, @@ -243,10 +243,10 @@ int ret; struct method_arg *arg = &h->args[i]; - ret = validate_arg_type(arg, - *args, - broker, - NAMESPACE(ref), + ret = validate_arg_type(arg, + *args, + broker, + NAMESPACE(ref), new_args, s); if (!ret) @@ -288,10 +288,10 @@ goto exit; } - ret = validate_args(h, - &argsin, + ret = validate_args(h, + &argsin, reference, - ctx->broker, + ctx->broker, &s); if (!ret) goto exit; @@ -302,7 +302,7 @@ exit: CMReturnDone(results); - return s; + return s; } CMPIStatus _std_cleanup(CMPIMethodMI *self, diff --git a/tools/indication_tester.py b/tools/indication_tester.py --- a/tools/indication_tester.py +++ b/tools/indication_tester.py @@ -14,264 +14,264 @@ def filter_xml(name, type, ns, sysname): return """ - <?xml version="1.0" encoding="utf-8"?> - <CIM CIMVERSION="2.0" DTDVERSION="2.0"> - <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> - <SIMPLEREQ> - <IMETHODCALL NAME="CreateInstance"> - <LOCALNAMESPACEPATH> - <NAMESPACE NAME="root"/> - <NAMESPACE NAME="PG_InterOp"/> - </LOCALNAMESPACEPATH> - <IPARAMVALUE NAME="NewInstance"> + <?xml version="1.0" encoding="utf-8"?> + <CIM CIMVERSION="2.0" DTDVERSION="2.0"> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="CreateInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="PG_InterOp"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="NewInstance"> <INSTANCE CLASSNAME="CIM_IndicationFilter"> - <PROPERTY NAME="SystemCreationClassName" TYPE="string"> - <VALUE>CIM_ComputerSystem</VALUE> - </PROPERTY> - <PROPERTY NAME="SystemName" TYPE="string"> - <VALUE>%s</VALUE> - </PROPERTY> - <PROPERTY NAME="CreationClassName" TYPE="string"> - <VALUE>CIM_IndicationFilter</VALUE> - </PROPERTY> - <PROPERTY NAME="Name" TYPE="string"> - <VALUE>%sFilter</VALUE> - </PROPERTY> - <PROPERTY NAME="Query" TYPE="string"> - <VALUE> SELECT * FROM %s - </VALUE> - </PROPERTY> - <PROPERTY NAME="QueryLanguage" TYPE="string"> - <VALUE>WQL</VALUE> - </PROPERTY> - <PROPERTY NAME="SourceNamespace" TYPE="string"> - <VALUE>%s</VALUE> - </PROPERTY> - </INSTANCE> - </IPARAMVALUE> - </IMETHODCALL> - </SIMPLEREQ> - </MESSAGE> + <PROPERTY NAME="SystemCreationClassName" TYPE="string"> + <VALUE>CIM_ComputerSystem</VALUE> + </PROPERTY> + <PROPERTY NAME="SystemName" TYPE="string"> + <VALUE>%s</VALUE> + </PROPERTY> + <PROPERTY NAME="CreationClassName" TYPE="string"> + <VALUE>CIM_IndicationFilter</VALUE> + </PROPERTY> + <PROPERTY NAME="Name" TYPE="string"> + <VALUE>%sFilter</VALUE> + </PROPERTY> + <PROPERTY NAME="Query" TYPE="string"> + <VALUE> SELECT * FROM %s + </VALUE> + </PROPERTY> + <PROPERTY NAME="QueryLanguage" TYPE="string"> + <VALUE>WQL</VALUE> + </PROPERTY> + <PROPERTY NAME="SourceNamespace" TYPE="string"> + <VALUE>%s</VALUE> + </PROPERTY> + </INSTANCE> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> </CIM> """ % (sysname, name, type, ns) def handler_xml(name, port, sysname): return """ - <?xml version="1.0" encoding="utf-8"?> - <CIM CIMVERSION="2.0" DTDVERSION="2.0"> - <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> - <SIMPLEREQ> - <IMETHODCALL NAME="CreateInstance"> - <LOCALNAMESPACEPATH> - <NAMESPACE NAME="root"/> - <NAMESPACE NAME="PG_InterOp"/> - </LOCALNAMESPACEPATH> - <IPARAMVALUE NAME="NewInstance"> - <INSTANCE CLASSNAME="CIM_IndicationHandlerCIMXML"> - <PROPERTY NAME="SystemCreationClassName" TYPE="string"> - <VALUE>CIM_ComputerSystem</VALUE> - </PROPERTY> - <PROPERTY NAME="SystemName" TYPE="string"> - <VALUE>%s</VALUE> - </PROPERTY> - <PROPERTY NAME="CreationClassName" TYPE="string"> - <VALUE>CIM_IndicationHandlerCIMXML</VALUE> - </PROPERTY> - <PROPERTY NAME="Name" TYPE="string"> - <VALUE>%sHandler</VALUE> - </PROPERTY> - <PROPERTY NAME="Destination" TYPE="string"> - <VALUE>http://localhost:%i</VALUE> - </PROPERTY> - </INSTANCE> - </IPARAMVALUE> - </IMETHODCALL> - </SIMPLEREQ> - </MESSAGE> + <?xml version="1.0" encoding="utf-8"?> + <CIM CIMVERSION="2.0" DTDVERSION="2.0"> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="CreateInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="PG_InterOp"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="NewInstance"> + <INSTANCE CLASSNAME="CIM_IndicationHandlerCIMXML"> + <PROPERTY NAME="SystemCreationClassName" TYPE="string"> + <VALUE>CIM_ComputerSystem</VALUE> + </PROPERTY> + <PROPERTY NAME="SystemName" TYPE="string"> + <VALUE>%s</VALUE> + </PROPERTY> + <PROPERTY NAME="CreationClassName" TYPE="string"> + <VALUE>CIM_IndicationHandlerCIMXML</VALUE> + </PROPERTY> + <PROPERTY NAME="Name" TYPE="string"> + <VALUE>%sHandler</VALUE> + </PROPERTY> + <PROPERTY NAME="Destination" TYPE="string"> + <VALUE>http://localhost:%i</VALUE> + </PROPERTY> + </INSTANCE> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> </CIM> """ % (sysname, name, port) def subscription_xml(name, sysname): return """ - <?xml version="1.0" encoding="utf-8"?> - <CIM CIMVERSION="2.0" DTDVERSION="2.0"> - <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> - <SIMPLEREQ> - <IMETHODCALL NAME="CreateInstance"> - <LOCALNAMESPACEPATH> - <NAMESPACE NAME="root"/> - <NAMESPACE NAME="PG_InterOp"/> - </LOCALNAMESPACEPATH> - <IPARAMVALUE NAME="NewInstance"> - <INSTANCE CLASSNAME="CIM_IndicationSubscription"> - <PROPERTY.REFERENCE NAME="Filter" - REFERENCECLASS="CIM_IndicationFilter"> - <VALUE.REFERENCE> - <INSTANCENAME CLASSNAME="CIM_IndicationFilter"> - <KEYBINDING NAME="SystemCreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_ComputerSystem - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="SystemName"> - <KEYVALUE VALUETYPE="string"> - %s - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="CreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_IndicationFilter - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="Name"> - <KEYVALUE VALUETYPE="string"> - %sFilter - </KEYVALUE> - </KEYBINDING> - </INSTANCENAME> - </VALUE.REFERENCE> - </PROPERTY.REFERENCE> - <PROPERTY.REFERENCE NAME="Handler" - REFERENCECLASS="CIM_IndicationHandler"> - <VALUE.REFERENCE> - <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML"> - <KEYBINDING NAME="SystemCreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_ComputerSystem - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="SystemName"> - <KEYVALUE VALUETYPE="string"> + <?xml version="1.0" encoding="utf-8"?> + <CIM CIMVERSION="2.0" DTDVERSION="2.0"> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="CreateInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="PG_InterOp"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="NewInstance"> + <INSTANCE CLASSNAME="CIM_IndicationSubscription"> + <PROPERTY.REFERENCE NAME="Filter" + REFERENCECLASS="CIM_IndicationFilter"> + <VALUE.REFERENCE> + <INSTANCENAME CLASSNAME="CIM_IndicationFilter"> + <KEYBINDING NAME="SystemCreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_ComputerSystem + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="SystemName"> + <KEYVALUE VALUETYPE="string"> %s - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="CreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_IndicationHandlerCIMXML - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="Name"> - <KEYVALUE VALUETYPE="string"> - %sHandler - </KEYVALUE> - </KEYBINDING> - </INSTANCENAME> - </VALUE.REFERENCE> - </PROPERTY.REFERENCE> - <PROPERTY NAME="SubscriptionState" TYPE="uint16"> - <VALUE> 2 </VALUE> - </PROPERTY> - </INSTANCE> - </IPARAMVALUE> - </IMETHODCALL> - </SIMPLEREQ> - </MESSAGE> + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="CreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_IndicationFilter + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="Name"> + <KEYVALUE VALUETYPE="string"> + %sFilter + </KEYVALUE> + </KEYBINDING> + </INSTANCENAME> + </VALUE.REFERENCE> + </PROPERTY.REFERENCE> + <PROPERTY.REFERENCE NAME="Handler" + REFERENCECLASS="CIM_IndicationHandler"> + <VALUE.REFERENCE> + <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML"> + <KEYBINDING NAME="SystemCreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_ComputerSystem + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="SystemName"> + <KEYVALUE VALUETYPE="string"> + %s + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="CreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_IndicationHandlerCIMXML + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="Name"> + <KEYVALUE VALUETYPE="string"> + %sHandler + </KEYVALUE> + </KEYBINDING> + </INSTANCENAME> + </VALUE.REFERENCE> + </PROPERTY.REFERENCE> + <PROPERTY NAME="SubscriptionState" TYPE="uint16"> + <VALUE> 2 </VALUE> + </PROPERTY> + </INSTANCE> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> </CIM> """ % (sysname, name, sysname, name) def delete_inst_xml(name, type, sysname, inst_name): return """ - <?xml version="1.0" encoding="utf-8"?> - <CIM CIMVERSION="2.0" DTDVERSION="2.0"> - <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> - <SIMPLEREQ> - <IMETHODCALL NAME="DeleteInstance"> - <LOCALNAMESPACEPATH> - <NAMESPACE NAME="root"/> - <NAMESPACE NAME="PG_InterOp"/> - </LOCALNAMESPACEPATH> - <IPARAMVALUE NAME="InstanceName"> - <INSTANCENAME CLASSNAME="CIM_Indication%s"> - <KEYBINDING NAME="SystemCreationClassName"> - <KEYVALUE>CIM_ComputerSystem</KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="SystemName"> - <KEYVALUE>%s</KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="CreationClassName"> - <KEYVALUE>CIM_Indication%s</KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="Name"> - <KEYVALUE>%s</KEYVALUE> - </KEYBINDING> - </INSTANCENAME> - </IPARAMVALUE> - </IMETHODCALL> - </SIMPLEREQ> - </MESSAGE> + <?xml version="1.0" encoding="utf-8"?> + <CIM CIMVERSION="2.0" DTDVERSION="2.0"> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="DeleteInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="PG_InterOp"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="InstanceName"> + <INSTANCENAME CLASSNAME="CIM_Indication%s"> + <KEYBINDING NAME="SystemCreationClassName"> + <KEYVALUE>CIM_ComputerSystem</KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="SystemName"> + <KEYVALUE>%s</KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="CreationClassName"> + <KEYVALUE>CIM_Indication%s</KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="Name"> + <KEYVALUE>%s</KEYVALUE> + </KEYBINDING> + </INSTANCENAME> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> </CIM>; """ % (type, sysname, type, inst_name); def delete_sub_xml(name, sysname): return """ - <?xml version="1.0" encoding="utf-8"?> - <CIM CIMVERSION="2.0" DTDVERSION="2.0"> - <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> - <SIMPLEREQ> - <IMETHODCALL NAME="DeleteInstance"> - <LOCALNAMESPACEPATH> - <NAMESPACE NAME="root"/> - <NAMESPACE NAME="PG_InterOp"/> - </LOCALNAMESPACEPATH> - <IPARAMVALUE NAME="InstanceName"> - <INSTANCENAME CLASSNAME="CIM_IndicationSubscription"> - <KEYBINDING NAME="Filter"> - <VALUE.REFERENCE> - <INSTANCENAME CLASSNAME="CIM_IndicationFilter"> - <KEYBINDING NAME="SystemCreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_ComputerSystem - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="SystemName"> - <KEYVALUE VALUETYPE="string"> + <?xml version="1.0" encoding="utf-8"?> + <CIM CIMVERSION="2.0" DTDVERSION="2.0"> + <MESSAGE ID="4711" PROTOCOLVERSION="1.0"> + <SIMPLEREQ> + <IMETHODCALL NAME="DeleteInstance"> + <LOCALNAMESPACEPATH> + <NAMESPACE NAME="root"/> + <NAMESPACE NAME="PG_InterOp"/> + </LOCALNAMESPACEPATH> + <IPARAMVALUE NAME="InstanceName"> + <INSTANCENAME CLASSNAME="CIM_IndicationSubscription"> + <KEYBINDING NAME="Filter"> + <VALUE.REFERENCE> + <INSTANCENAME CLASSNAME="CIM_IndicationFilter"> + <KEYBINDING NAME="SystemCreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_ComputerSystem + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="SystemName"> + <KEYVALUE VALUETYPE="string"> %s - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="CreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_IndicationFilter - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="Name"> - <KEYVALUE VALUETYPE="string"> - %sFilter - </KEYVALUE> - </KEYBINDING> - </INSTANCENAME> - </VALUE.REFERENCE> - </KEYBINDING> - <KEYBINDING NAME="Handler"> - <VALUE.REFERENCE> - <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML"> - <KEYBINDING NAME="SystemCreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_ComputerSystem - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="SystemName"> - <KEYVALUE VALUETYPE="string"> + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="CreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_IndicationFilter + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="Name"> + <KEYVALUE VALUETYPE="string"> + %sFilter + </KEYVALUE> + </KEYBINDING> + </INSTANCENAME> + </VALUE.REFERENCE> + </KEYBINDING> + <KEYBINDING NAME="Handler"> + <VALUE.REFERENCE> + <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML"> + <KEYBINDING NAME="SystemCreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_ComputerSystem + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="SystemName"> + <KEYVALUE VALUETYPE="string"> %s - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="CreationClassName"> - <KEYVALUE VALUETYPE="string"> - CIM_IndicationHandlerCIMXML - </KEYVALUE> - </KEYBINDING> - <KEYBINDING NAME="Name"> - <KEYVALUE VALUETYPE="string"> - %sHandler - </KEYVALUE> - </KEYBINDING> - </INSTANCENAME> - </VALUE.REFERENCE> - </KEYBINDING> - </INSTANCENAME> - </IPARAMVALUE> - </IMETHODCALL> - </SIMPLEREQ> - </MESSAGE> + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="CreationClassName"> + <KEYVALUE VALUETYPE="string"> + CIM_IndicationHandlerCIMXML + </KEYVALUE> + </KEYBINDING> + <KEYBINDING NAME="Name"> + <KEYVALUE VALUETYPE="string"> + %sHandler + </KEYVALUE> + </KEYBINDING> + </INSTANCENAME> + </VALUE.REFERENCE> + </KEYBINDING> + </INSTANCENAME> + </IPARAMVALUE> + </IMETHODCALL> + </SIMPLEREQ> + </MESSAGE> </CIM>; """ % (sysname, name, sysname, name) @@ -304,8 +304,8 @@ self.ns = ns self.sysname = sysname - self.port = 8000 + port - self.server = BaseHTTPServer.HTTPServer(('', self.port), + self.port = 8000 + port + self.server = BaseHTTPServer.HTTPServer(('', self.port), CIMSocketHandler) self.server.print_ind = print_ind self.server.indications = [] @@ -319,14 +319,14 @@ "CIMMethod" : method, "CIMObject" : "root/PG_Interop", "Content-Type" : 'application/xml; charset="utf-8"'} - + if auth_hdr: headers["Authorization"] = "Basic %s" % auth_hdr conn.request("POST", "/cimom", body, headers) resp = conn.getresponse() if not resp.getheader("content-length"): - raise Exception("Request Failed: %d %s" % + raise Exception("Request Failed: %d %s" % (resp.status, resp.reason)) resp.read() @@ -380,11 +380,11 @@ print "DeleteHandler:\n%s\n" % del_handler_str print "CreateSubscription:\n%s\n" % subscript_str print "DeleteSubscription:\n%s\n" % del_subscript_str - + def main(): usage = "usage: %prog [options] provider\nex: %prog CIM_InstModification" parser = OptionParser(usage) - + parser.add_option("-u", "--url", dest="url", default="localhost:5988", help="URL of CIMOM to connect to (host:port)") parser.add_option("-N", "--ns", dest="ns", default="root/virt", @@ -410,17 +410,17 @@ if len(args) == 0: print "Fatal: no indication type provided." sys.exit(1) - + if options.username: auth = (options.username, options.password) else: auth = None - + if ":" in options.url: (sysname, port) = options.url.split(":") else: sysname = options.url - + if options.dump: dump_xml(options.name, args[0], options.ns, sysname) sys.exit(0)

# HG changeset patch # User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; # Date 1305559378 10800 # Node ID 308920f42e59be2aa8a4055a277fed5c373a319e # Parent bd7bf41ffea870361297f8327212f3a81aca1084 libcmpituil: Proper definition of LEX_OUTPUT_ROOT Move definition from Makefile.am to configure.ac to shut up automake Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com&gt; diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -31,7 +31,6 @@ AM_YFLAGS = -d -p eo_parse_ if build_eoparser -LEX_OUTPUT_ROOT = lex.eo_parse_ libcueoparser_la_SOURCES = eo_util_parser.y eo_util_lexer.l eo_parser.c libcmpiutil_la_DEPENDENCIES += libcueoparser.la libcmpiutil_la_LIBADD += -lcueoparser diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AC_PROG_CC AC_PROG_LEX +AC_SUBST([LEX_OUTPUT_ROOT], [lex.eo_parse_]) AC_PROG_YACC AC_C_CONST