← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_file/auth_file.cc

  • Committer: Brian Aker
  • Date: 2011-02-01 02:51:01 UTC
  • mto: (2132.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2134.
  • Revision ID: brian@tangent.org-20110201025101-yaj5kkdk2towo6ou
Merge in error message rework. Many error messages are fixed in this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_file/auth_file.cc
222
222
  const module::option_map &vm= context.getOptions();
223
223
 
224
224
  AuthFile *auth_file = new AuthFile("auth_file", fs::path(vm["users"].as<string>()));
225
 
  if (!auth_file->loadFile())
 
225
  if (not auth_file->loadFile())
226
226
  {
227
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Could not load auth file: %s\n"),
 
227
    errmsg_printf(error::ERROR, _("Could not load auth file: %s\n"),
228
228
                  auth_file->getError().c_str());
229
229
    delete auth_file;
230
230
    return 1;
232
232
 
233
233
  context.add(auth_file);
234
234
  context.registerVariable(new sys_var_const_string_val("users", vm["users"].as<string>()));
 
235
 
235
236
  return 0;
236
237
}
237
238