# HG changeset patch # User Eduardo Lima (Etrunko) <eblima@br.ibm.com> # Date 1305296515 10800 # Node ID d3435ce63194d7e65bf005ac69a857284a300094 # Parent 781e3d4d2d52597a8304b09511cf5033af8bdf62 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> diff -r 781e3d4d2d52 -r d3435ce63194 args_util.c --- a/args_util.c Fri May 13 11:13:41 2011 -0300 +++ b/args_util.c Fri May 13 11:21:55 2011 -0300 @@ -24,8 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#include <cmpidt.h> -#include <cmpift.h> #include <cmpimacs.h> #include "libcmpiutil.h" diff -r 781e3d4d2d52 -r d3435ce63194 debug_util.c --- a/debug_util.c Fri May 13 11:13:41 2011 -0300 +++ b/debug_util.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 eo_parser.c --- a/eo_parser.c Fri May 13 11:13:41 2011 -0300 +++ b/eo_parser.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 eo_parser_xml.c --- a/eo_parser_xml.c Fri May 13 11:13:41 2011 -0300 +++ b/eo_parser_xml.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 eo_util_lexer.l --- a/eo_util_lexer.l Fri May 13 11:13:41 2011 -0300 +++ b/eo_util_lexer.l Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 eo_util_parser.y --- a/eo_util_parser.y Fri May 13 11:13:41 2011 -0300 +++ b/eo_util_parser.y Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 inst_list.c --- a/inst_list.c Fri May 13 11:13:41 2011 -0300 +++ b/inst_list.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 instance_util.c --- a/instance_util.c Fri May 13 11:13:41 2011 -0300 +++ b/instance_util.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 libcmpiutil.h --- a/libcmpiutil.h Fri May 13 11:13:41 2011 -0300 +++ b/libcmpiutil.h Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 std_association.c --- a/std_association.c Fri May 13 11:13:41 2011 -0300 +++ b/std_association.c Fri May 13 11:21:55 2011 -0300 @@ -22,10 +22,6 @@ */ #include <string.h> -#include <cmpidt.h> -#include <cmpift.h> -#include <cmpimacs.h> - #include "libcmpiutil.h" #include "std_association.h" diff -r 781e3d4d2d52 -r d3435ce63194 std_association.h --- a/std_association.h Fri May 13 11:13:41 2011 -0300 +++ b/std_association.h Fri May 13 11:21:55 2011 -0300 @@ -23,6 +23,7 @@ #define __STD_ASSOCIATION_H #include <cmpidt.h> +#include <cmpift.h> struct std_assoc; struct std_assoc_info; diff -r 781e3d4d2d52 -r d3435ce63194 std_indication.c --- a/std_indication.c Fri May 13 11:13:41 2011 -0300 +++ b/std_indication.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 std_indication.h --- a/std_indication.h Fri May 13 11:13:41 2011 -0300 +++ b/std_indication.h Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 std_invokemethod.c --- a/std_invokemethod.c Fri May 13 11:13:41 2011 -0300 +++ b/std_invokemethod.c Fri May 13 11:21:55 2011 -0300 @@ -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 -r 781e3d4d2d52 -r d3435ce63194 std_invokemethod.h --- a/std_invokemethod.h Fri May 13 11:13:41 2011 -0300 +++ b/std_invokemethod.h Fri May 13 11:21:55 2011 -0300 @@ -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,