[Openvas-commits] r9418 - in trunk/openvas-libraries: . nasl

[scm-commit@wald.intevation.org]

Author: jan
Date: 2010-11-16 17:18:00 +0100 (Tue, 16 Nov 2010)
New Revision: 9418

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/nasl/nasl_func.c
Log:
* nasl/nasl_func.c (qsortcmp): Added this typedef to allow proper cast.
(insert_nasl_func): Apply cast to qsortcmp for strcmp used in qsort.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2010-11-16 16:00:49 UTC (rev 9417)
+++ trunk/openvas-libraries/ChangeLog	2010-11-16 16:18:00 UTC (rev 9418)
@@ -1,5 +1,10 @@
 2010-11-16  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	* nasl/nasl_func.c (qsortcmp): Added this typedef to allow proper cast.
+	(insert_nasl_func): Apply cast to qsortcmp for strcmp used in qsort.
+
+2010-11-16  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	* misc/bpf_share.c (bpf_open_live): Lowered limit of for-loop by 1
 	because currently it would exceed the fixed field size.
 	This is just from reading the code and because we got a compiler

Modified: trunk/openvas-libraries/nasl/nasl_func.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_func.c	2010-11-16 16:00:49 UTC (rev 9417)
+++ trunk/openvas-libraries/nasl/nasl_func.c	2010-11-16 16:18:00 UTC (rev 9418)
@@ -74,6 +74,8 @@
   return NULL;
 }
 
+typedef int(*qsortcmp)(const void *, const void *);
+
 nasl_func *
 insert_nasl_func (lex_ctxt * lexic, const char *fname, tree_cell * decl_node)
 {
@@ -106,7 +108,7 @@
           pf->args_names[i++] = estrdup (pc->x.str_val);
       /* Sort argument names */
       qsort (pf->args_names, pf->nb_named_args, sizeof (pf->args_names[0]),
-             strcmp);
+             (qsortcmp)strcmp);
 
       pf->block = decl_node->link[1];
       ref_cell (pf->block);