Drop ARGTYPE_COUNT

5 files changed, 4 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 45512e4..e1ed4f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-01-06  Petr Machata  <pmachata@redhat.com>
 
+	* type.h (enum arg_type): Drop ARGTYPE_COUNT
+
+2012-01-06  Petr Machata  <pmachata@redhat.com>
+
 	* common.h (struct Function.own_return_info): New field
 	* output.c (build_default_prototype): Initialize it
 	* read_config_file.c: Use it throughout.  Now that it's tracked,
diff --git a/display_args.c b/display_args.c
index 9b27155..8b514eb 100644
--- a/display_args.c
+++ b/display_args.c
@@ -384,9 +384,6 @@ format_argument(FILE *stream, struct value *value, struct value_dict *arguments)
 
 	case ARGTYPE_ENUM:
 		return format_enum(stream, value, arguments);
-
-	case ARGTYPE_COUNT:
-		abort();
 	}
 	abort();
 }
diff --git a/read_config_file.c b/read_config_file.c
index 08f94ba..8983973 100644
--- a/read_config_file.c
+++ b/read_config_file.c
@@ -673,8 +673,6 @@ parse_nonpointer_type(char **str, int *ownp)
 		/* Pointer syntax is not based on keyword, so we
 		 * should never get this type.  */
 		assert(type != ARGTYPE_POINTER);
-	case ARGTYPE_COUNT:
-		abort();
 	}
 
 	struct arg_type_info *info = malloc(sizeof(*info));
diff --git a/type.c b/type.c
index c8d37ef..5382315 100644
--- a/type.c
+++ b/type.c
@@ -54,7 +54,6 @@ type_get_simple(enum arg_type type)
 #undef HANDLE
 
 	case ARGTYPE_STRING_N:
-	case ARGTYPE_COUNT:
 
 	case ARGTYPE_ARRAY:
 	case ARGTYPE_ENUM:
@@ -328,7 +327,6 @@ type_destroy(struct arg_type_info *info)
 		break;
 
 	case ARGTYPE_FORMAT:
-	case ARGTYPE_COUNT:
 		break;
 	}
 }
@@ -440,7 +438,6 @@ type_sizeof(struct Process *proc, struct arg_type_info *type)
 
 	case ARGTYPE_FORMAT:
 	case ARGTYPE_STRING_N:
-	case ARGTYPE_COUNT:
 		return -1;
 	}
 
diff --git a/type.h b/type.h
index 599741b..848d234 100644
--- a/type.h
+++ b/type.h
@@ -45,7 +45,6 @@ enum arg_type {
 	ARGTYPE_ENUM,		/* Enumeration */
 	ARGTYPE_STRUCT,		/* Structure of values */
 	ARGTYPE_POINTER,	/* Pointer to some other type */
-	ARGTYPE_COUNT		/* number of ARGTYPE_* values */
 };
 
 struct arg_type_info {