[tfaber] 68697: [HHPCOMP] - Fix VC10 build - Don't cast function pointers - Fix warnings

Author: tfaber
Date: Tue Aug 11 21:16:24 2015
New Revision: 68697

URL: http://svn.reactos.org/svn/reactos?rev=68697&view=rev
Log:
[HHPCOMP]
- Fix VC10 build
- Don't cast function pointers
- Fix warnings

Modified:
    trunk/reactos/tools/hhpcomp/chmc/chmc.c
    trunk/reactos/tools/hhpcomp/chmc/err.c

Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?r...
==============================================================================
--- trunk/reactos/tools/hhpcomp/chmc/chmc.c	[iso-8859-1] (original)
+++ trunk/reactos/tools/hhpcomp/chmc/chmc.c	[iso-8859-1] Tue Aug 11 21:16:24 2015
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if !defined(__GNUC__) || defined(__MINGW32__)
-typedef int (*__compar_fn_t)(const void *, const void *);
-#endif
-
 #else
 #include <unistd.h>
 #endif
@@ -70,10 +66,6 @@
 void chmc_entries_free(struct chmcFile *chm);
 void chmc_entry_destroy(struct chmcTreeNode *node);
 int chmc_add_tree(struct chmcFile *chm, const char *dir);
-static int _add_tree_file( struct dir_tree_global *dtg,
-                           struct dir_tree_local *dtl );
-static int _add_tree_dir(struct dir_tree_global *dtg,
-                         struct dir_tree_local *dtl);
 struct chmcTreeNode *chmc_add_file(struct chmcFile *chm, const char *filename,
                                    UInt16 prefixlen, int sect_id, UChar *buf,
                                    UInt64 len);
@@ -92,7 +84,7 @@
 void chmc_pmgl_done(struct chmcFile *chm);

void chmc_entries_qsort(struct chmcFile *chm);
-static int _entry_cmp(struct chmcTreeNode **pa, struct chmcTreeNode **pb);
+static int _entry_cmp(const void *pva, const void *pvb);

struct chmcSection *chmc_section_lookup(struct chmcFile *chm, int id);

@@ -1209,12 +1201,14 @@
    }

qsort(chm->sort_entries, chm->entries_num, sizeof(struct chmcTreeNode *),
-	      (__compar_fn_t) _entry_cmp);
-}
-
-static int _entry_cmp(struct chmcTreeNode **pa, struct chmcTreeNode **pb)
-{
-	struct chmcTreeNode *a = *pa, *b = *pb;
+	      _entry_cmp);
+}
+
+static int _entry_cmp(const void *pva, const void *pvb)
+{
+	const struct chmcTreeNode * const *pa = pva;
+	const struct chmcTreeNode * const *pb = pvb;
+	const struct chmcTreeNode *a = *pa, *b = *pb;

return strcmp( &a->name[a->prefixlen], &b->name[b->prefixlen] );
 }

Modified: trunk/reactos/tools/hhpcomp/chmc/err.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/err.c?re...
==============================================================================
--- trunk/reactos/tools/hhpcomp/chmc/err.c	[iso-8859-1] (original)
+++ trunk/reactos/tools/hhpcomp/chmc/err.c	[iso-8859-1] Tue Aug 11 21:16:24 2015
@@ -30,8 +30,8 @@
 };

static struct chmcErr chmc_err = {
-	.code = CHMC_NOERR,
-	.msg[0] = '\0',
+	CHMC_NOERR,
+	'\0',
 };

void chmcerr_clean(void) {