[OSADL-svn-commits] r100 - in trunks/fddi-trunk: include/osadl src

[OSADL repository commits]

Author: robert
Date: Thu Aug  9 18:02:49 2007
New Revision: 100

Log:
renamed postfix to suffix

Modified:
   trunks/fddi-trunk/include/osadl/fddi_id.h
   trunks/fddi-trunk/src/libfddi.c
   trunks/fddi-trunk/src/libfddi_libmodbus.c

Modified: trunks/fddi-trunk/include/osadl/fddi_id.h
==============================================================================
--- trunks/fddi-trunk/include/osadl/fddi_id.h	(original)
+++ trunks/fddi-trunk/include/osadl/fddi_id.h	Thu Aug  9 18:02:49 2007
@@ -31,7 +31,7 @@
 	/* private */
 	char *prefix;
 	int index;
-	char *postfix;
+	char *suffix;
 
 	char *id_as_string;
 	size_t id_as_str_len;
@@ -39,7 +39,7 @@
 	void *priv;
 };
 
-extern int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *postfix);
+extern int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *suffix);
 extern int fddi_id_getid(fddi_id_t *fddi_id, char *id_string, size_t len);
 extern int fddi_id_destroy(fddi_id_t *fddi_id);
 

Modified: trunks/fddi-trunk/src/libfddi.c
==============================================================================
--- trunks/fddi-trunk/src/libfddi.c	(original)
+++ trunks/fddi-trunk/src/libfddi.c	Thu Aug  9 18:02:49 2007
@@ -509,11 +509,11 @@
 
 /* fddi_id_t */
 
-int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *postfix)
+int fddi_id_init(fddi_id_t *fddi_id, const char *prefix, int index, const char *suffix)
 {
 	int prefix_len;
 	int index_len;
-	int postfix_len;
+	int suffix_len;
 	char index_as_string[30]; /* FIXME: find out max strlen of printf(int) */
 
 	memset(fddi_id, 0, sizeof(fddi_id_t));
@@ -530,16 +530,16 @@
 	} else
 		prefix_len = 0;
 
-	if (postfix) {
-		postfix_len = strlen(postfix);
-		fddi_id->postfix = strdup(postfix);
-		if (!fddi_id->postfix)
-			goto postfix_err;
+	if (suffix) {
+		suffix_len = strlen(suffix);
+		fddi_id->suffix = strdup(suffix);
+		if (!fddi_id->suffix)
+			goto suffix_err;
 	} else
-		postfix_len = 0;
+		suffix_len = 0;
 
 
-	fddi_id->id_as_str_len = prefix_len + index_len + postfix_len;
+	fddi_id->id_as_str_len = prefix_len + index_len + suffix_len;
 
 	fddi_id->id_as_string = malloc(fddi_id->id_as_str_len + 1);
 	if (!fddi_id->id_as_string)
@@ -548,15 +548,15 @@
 	sprintf(fddi_id->id_as_string, "%s%s%s",
 		fddi_id->prefix ? fddi_id->prefix : "",
 		index_as_string ? index_as_string : "",
-		fddi_id->postfix ? fddi_id->postfix: "");
+		fddi_id->suffix ? fddi_id->suffix: "");
 
 	return 0;
 
 id_as_str_err:
 	fddi_id->id_as_str_len = 0;
-	free(fddi_id->postfix);
-	fddi_id->postfix = NULL;
-postfix_err:
+	free(fddi_id->suffix);
+	fddi_id->suffix = NULL;
+suffix_err:
 	free(fddi_id->prefix);
 	fddi_id->prefix = NULL;
 prefix_err:
@@ -576,7 +576,7 @@
 int fddi_id_destroy(fddi_id_t *fddi_id)
 {
 	free(fddi_id->prefix);
-	free(fddi_id->postfix);
+	free(fddi_id->suffix);
 	free(fddi_id->id_as_string);
 
 	return 0;

Modified: trunks/fddi-trunk/src/libfddi_libmodbus.c
==============================================================================
--- trunks/fddi-trunk/src/libfddi_libmodbus.c	(original)
+++ trunks/fddi-trunk/src/libfddi_libmodbus.c	Thu Aug  9 18:02:49 2007
@@ -17,7 +17,7 @@
 	.id = {
 		.prefix = "dout",
 		.index = -1,
-		.postfix = "",
+		.suffix = "",
 	},
 	.direction = OUT,
 	.cycletime = (10*1000*1000),
@@ -27,7 +27,7 @@
 	.id = {
 		.prefix = "signal_red",
 		.index = -1,
-		.postfix = "",
+		.suffix = "",
 	},
 	.param_list_head = NULL,
 	.name = NULL,
@@ -40,7 +40,7 @@
 	.id = {
 		.prefix = "signal_yellow",
 		.index = -1,
-		.postfix = "",
+		.suffix = "",
 	},
 	.param_list_head = NULL,
 	.name = NULL,
@@ -53,7 +53,7 @@
 	.id = {
 		.prefix = "signal_green",
 		.index = -1,
-		.postfix = "",
+		.suffix = "",
 	},
 	.param_list_head = NULL,
 	.name = NULL,