← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cached_directory.cc

  • Committer: Lee Bieber
  • Date: 2011-03-01 01:51:22 UTC
  • mfrom: (2209.1.3 build)
  • Revision ID: kalebral@gmail.com-20110301015122-jse47000xs6xp062
Merge Patrick - 726914: Need to update dbqp randgen config files for slave_plugin 
Merge Olaf - fix EOL
Merge Patrick - 725236: randgen transaction log tests need to be implemented using dbqp / randgen

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/cached_directory.cc
37
37
#include <limits.h>
38
38
 
39
39
#include <drizzled/cached_directory.h>
 
40
#include <drizzled/util/find_ptr.h>
40
41
 
41
42
using namespace std;
42
43
 
133
134
    if (not allowed_exts.empty())
134
135
    {
135
136
      char *ptr= rindex(result->d_name, '.');
136
 
 
137
 
      if (ptr)
 
137
      if (ptr && allowed_exts.count(ptr))
138
138
      {
139
 
        set<string>::iterator it;
140
 
        it= allowed_exts.find(ptr);
141
 
 
142
 
        if (it != allowed_exts.end())
143
 
        {
144
 
          entries.push_back(new Entry(result->d_name));
145
 
        }
 
139
        entries.push_back(new Entry(result->d_name));
146
140
      }
147
141
    }
148
142
    else