Two functions strcnt() with distinct prototypes where defined and only one was used,

causing a -Wunused-function warning. Also strcnt() is used in WIN32 only, so should not
belong to Fl_Native_File_Chooser_common.cxx that contains functions used across
platforms.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 13 insertions, 19 deletions

diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx
index c7ad2ea62..cc8903028 100644
--- a/src/Fl_Native_File_Chooser_WIN32.cxx
+++ b/src/Fl_Native_File_Chooser_WIN32.cxx
@@ -663,6 +663,19 @@ void Fl_Native_File_Chooser::add_filter(const char *name_in,	// name of filter (
   //DEBUG printf("DEBUG: ADD FILTER name=<%s> winfilter=<%s>\n", name, winfilter);
 }
 
+// COUNT OCCURRENCES OF ANY CHARS FROM 'find' IN 's'.
+static int strcnt(const char *s, const char *find) {
+  int cnt = 0;
+  const char *f;
+  while ( *s ) {
+    for (f=find; *f; f++) {
+      if (*s == *f) { ++cnt; break; }
+    }
+    ++s;
+  }
+  return cnt;
+}
+
 // CONVERT FLTK STYLE PATTERN MATCHES TO WINDOWS 'DOUBLENULL' PATTERN
 // Returns with the parsed double-null result in '_parsedfilt'.
 //
diff --git a/src/Fl_Native_File_Chooser_common.cxx b/src/Fl_Native_File_Chooser_common.cxx
index 07e2a1ad6..6636dfecd 100644
--- a/src/Fl_Native_File_Chooser_common.cxx
+++ b/src/Fl_Native_File_Chooser_common.cxx
@@ -71,25 +71,6 @@ static void chrcat(char *s, char c) {
   strcat(s, tmp);
 }
 
-// COUNT OCCURRENCES OF CHAR 'c' IN 'find'.
-static int strcnt(const char *s, char c) {
-  int cnt = 0;
-  while ( *s ) { if (*s++ == c ) ++cnt; }
-  return cnt;
-}
-
-// COUNT OCCURRENCES OF ANY CHARS FROM 'find' IN 's'.
-static int strcnt(const char *s, const char *find) {
-  int cnt = 0;
-  const char *f;
-  while ( *s ) {
-    for (f=find; *f; f++) {
-      if (*s == *f) { ++cnt; break; }
-    }
-    ++s;
-  }
-  return cnt;
-}
 
 //
 // End of "$Id$".