X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=wrappergen%2Fwrite_jna.c;h=d005b46765b1bf185145abfa140c8710ac343052;hb=ac37e350f155e28e3a58a98f5d0b942d7fba426f;hp=1739481ba1f8b6e1cd2df8e9ca53951a2b468529;hpb=25e87415eecbd8d7cd3811d745568e70cec17bf1;p=cparser

diff --git a/wrappergen/write_jna.c b/wrappergen/write_jna.c
index 1739481..d005b46 100644
--- a/wrappergen/write_jna.c
+++ b/wrappergen/write_jna.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include "adt/strutil.h"
 #include "write_jna.h"
 #include "symbol_t.h"
 #include "ast_t.h"
@@ -46,7 +47,7 @@ static const char    *libname;
 
 static bool is_system_header(const char *fname)
 {
-	if (strncmp(fname, "/usr/include", 12) == 0)
+	if (strstart(fname, "/usr/include"))
 		return true;
 	if (fname == builtin_source_position.input_name)
 		return true;
@@ -55,17 +56,17 @@ static bool is_system_header(const char *fname)
 
 static const char *fix_builtin_names(const char *name)
 {
-	if (strcmp(name, "class") == 0) {
+	if (streq(name, "class")) {
 		return "_class";
-	} else if(strcmp(name, "this") == 0) {
+	} else if (streq(name, "this")) {
 		return "_this";
-	} else if(strcmp(name, "public") == 0) {
+	} else if (streq(name, "public")) {
 		return "_public";
-	} else if(strcmp(name, "protected") == 0) {
+	} else if (streq(name, "protected")) {
 		return "_protected";
-	} else if(strcmp(name, "private") == 0) {
+	} else if (streq(name, "private")) {
 		return "_private";
-	} else if(strcmp(name, "final") == 0) {
+	} else if (streq(name, "final")) {
 		return "_final";
 	}
 	/* TODO put all reserved names here */
@@ -313,17 +314,17 @@ static void write_expression(const expression_t *expression)
 	case EXPR_LITERAL_INTEGER_HEXADECIMAL:
 		fprintf(out, "0x%s", expression->literal.value.begin);
 		break;
-	case EXPR_REFERENCE_ENUM_VALUE: {
+	case EXPR_ENUM_CONSTANT: {
 		/* UHOH... hacking */
 		entity_t *entity = expression->reference.entity;
 		write_enum_name(& entity->enum_value.enum_type->enumt);
 		fprintf(out, ".%s.val", entity->base.symbol->string);
 		break;
 	}
-	EXPR_UNARY_CASES
+	case EXPR_UNARY_CASES:
 		write_unary_expression(&expression->unary);
 		break;
-	EXPR_BINARY_CASES
+	case EXPR_BINARY_CASES:
 		write_binary_expression(&expression->binary);
 		break;
 	default:
@@ -540,7 +541,7 @@ void write_jna_decls(FILE *output, const translation_unit_t *unit)
 			bool in_limits = false;
 			for (output_limit *limit = output_limits; limit != NULL;
 			     limit = limit->next) {
-			    if (strcmp(limit->filename, input_name) == 0) {
+			    if (streq(limit->filename, input_name)) {
 					in_limits = true;
 					break;
 				}