Răsfoiți Sursa

rename function: s/strstr_rs/strchr_rs/ to reflect new semantics

* exec/coroparse.c (parse_section):
* exec/util.c (strchr_rs, strstr_rs):
* exec/util.h (corosync_exit_error):

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2112 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering 17 ani în urmă
părinte
comite
283011c669
3 a modificat fișierele cu 6 adăugiri și 7 ștergeri
  1. 3 3
      exec/coroparse.c
  2. 2 3
      exec/util.c
  3. 1 1
      exec/util.h

+ 3 - 3
exec/coroparse.c

@@ -115,7 +115,7 @@ static int parse_section(FILE *fp,
 		}
 		}
 
 
 		/* New section ? */
 		/* New section ? */
-		if ((loc = strstr_rs (line, '{'))) {
+		if ((loc = strchr_rs (line, '{'))) {
 			hdb_handle_t new_parent;
 			hdb_handle_t new_parent;
 			char *section = remove_whitespace(line);
 			char *section = remove_whitespace(line);
 
 
@@ -128,7 +128,7 @@ static int parse_section(FILE *fp,
 		}
 		}
 
 
 		/* New key/value */
 		/* New key/value */
-		if ((loc = strstr_rs (line, ':'))) {
+		if ((loc = strchr_rs (line, ':'))) {
 			char *key;
 			char *key;
 			char *value;
 			char *value;
 
 
@@ -140,7 +140,7 @@ static int parse_section(FILE *fp,
 				value, strlen (value) + 1);
 				value, strlen (value) + 1);
 		}
 		}
 
 
-		if ((loc = strstr_rs (line, '}'))) {
+		if ((loc = strchr_rs (line, '}'))) {
 			return 0;
 			return 0;
 		}
 		}
 	}
 	}

+ 2 - 3
exec/util.c

@@ -1,7 +1,7 @@
 /*
 /*
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
  * Copyright (c) 2004 Open Source Development Lab
  * Copyright (c) 2004 Open Source Development Lab
- * Copyright (c) 2006-2007 Red Hat, Inc.
+ * Copyright (c) 2006-2007, 2009 Red Hat, Inc.
  *
  *
  * All rights reserved.
  * All rights reserved.
  *
  *
@@ -110,7 +110,7 @@ char *getcs_name_t (cs_name_t *name)
 	return ((char *)name->value);
 	return ((char *)name->value);
 }
 }
 
 
-char *strstr_rs (const char *haystack, int byte)
+char *strchr_rs (const char *haystack, int byte)
 {
 {
 	const char *end_address = strchr (haystack, byte);
 	const char *end_address = strchr (haystack, byte);
 	if (end_address) {
 	if (end_address) {
@@ -138,4 +138,3 @@ int cs_name_tisEqual (cs_name_t *str1, char *str2) {
 		return 0;
 		return 0;
 	}
 	}
 }
 }
-

+ 1 - 1
exec/util.h

@@ -73,7 +73,7 @@ extern void _corosync_exit_error (enum e_ais_done err, const char *file,
   __attribute__((__noreturn__));
   __attribute__((__noreturn__));
 void _corosync_out_of_memory_error (void) __attribute__((__noreturn__));
 void _corosync_out_of_memory_error (void) __attribute__((__noreturn__));
 extern char *getcs_name_t (cs_name_t *name);
 extern char *getcs_name_t (cs_name_t *name);
-extern char *strstr_rs (const char *haystack, int byte);
+extern char *strchr_rs (const char *haystack, int byte);
 extern void setcs_name_t (cs_name_t *name, char *str);
 extern void setcs_name_t (cs_name_t *name, char *str);
 extern int cs_name_tisEqual (cs_name_t *str1, char *str2);
 extern int cs_name_tisEqual (cs_name_t *str1, char *str2);
 #endif /* UTIL_H_DEFINED */
 #endif /* UTIL_H_DEFINED */