[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Wed Oct 27 12:50:23 MDT 2010


The branch, v3-6-test has been updated
       via  601c003 Fix bug 7754 - samba uses index(), marked as legacy. (cherry picked from commit be22adc642270eaeff10d969357e3fa13667d176)
      from  d3df21b s3: Make gpfs winattrs work again

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 601c00307c1dd4a94071e4a49e0c03799f9be30e
Author: Sven Neumann <s.neumann at raumfeld.com>
Date:   Wed Oct 27 11:42:34 2010 -0700

    Fix bug 7754 - samba uses index(), marked as legacy.
    (cherry picked from commit be22adc642270eaeff10d969357e3fa13667d176)

-----------------------------------------------------------------------

Summary of changes:
 source3/registry/reg_perfcount.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c
index c53036f..6a9c1af 100644
--- a/source3/registry/reg_perfcount.c
+++ b/source3/registry/reg_perfcount.c
@@ -621,14 +621,14 @@ static bool _reg_perfcount_add_counter(struct PERF_DATA_BLOCK *block,
 	obj = NULL;
 	memset(buf, 0, PERFCOUNT_MAX_LEN);
 	memcpy(buf, data.dptr, data.dsize);
-	begin = index(buf, '[');
-	end = index(buf, ']');
+	begin = strchr(buf, '[');
+	end = strchr(buf, ']');
 	if(begin == NULL || end == NULL)
 		return False;
 	start = begin+1;
 
 	while(start < end) {
-		stop = index(start, ',');
+		stop = strchr(start, ',');
 		if(stop == NULL)
 			stop = end;
 		*stop = '\0';


-- 
Samba Shared Repository


More information about the samba-cvs mailing list