← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Brian Aker
  • Date: 2009-03-05 02:48:46 UTC
  • mto: This revision was merged to the branch mainline in revision 911.
  • Revision ID: brian@tangent.org-20090305024846-0z5m0j3e80phlzh4
Remove my_fopen() and key_map.cc file (thanks to Jay's lcov)

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
821
821
  {
822
822
    if (cur_file->file && cur_file->file != stdin)
823
823
    {
824
 
      my_fclose(cur_file->file, MYF(0));
 
824
      fclose(cur_file->file);
825
825
    }
826
826
    free((unsigned char*) cur_file->file_name);
827
827
    cur_file->file_name= 0;
2063
2063
  if (cur_file == file_stack_end)
2064
2064
    die("Source directives are nesting too deep");
2065
2065
  cur_file++;
2066
 
  if (!(cur_file->file = my_fopen(buff, O_RDONLY, MYF(0))))
 
2066
  if (!(cur_file->file= fopen(buff, "r")))
2067
2067
  {
2068
2068
    cur_file--;
2069
2069
    die("Could not open '%s' for reading", buff);
4058
4058
  found_eof:
4059
4059
      if (cur_file->file != stdin)
4060
4060
      {
4061
 
        my_fclose(cur_file->file, MYF(0));
 
4061
        fclose(cur_file->file);
4062
4062
        cur_file->file= 0;
4063
4063
      }
4064
4064
      free((unsigned char*) cur_file->file_name);
4567
4567
    embedded_server_arg_count=1;
4568
4568
    embedded_server_args[0]= (char*) "";    /* Progname */
4569
4569
  }
4570
 
  if (!(file=my_fopen(buff, O_RDONLY, MYF(MY_WME))))
 
4570
  if (!(file= fopen(buff, "r")))
4571
4571
    die("Failed to open file '%s'", buff);
4572
4572
 
4573
4573
  while (embedded_server_arg_count < MAX_EMBEDDED_SERVER_ARGS &&
4577
4577
    if (!(embedded_server_args[embedded_server_arg_count]=
4578
4578
          (char*) strdup(str)))
4579
4579
    {
4580
 
      my_fclose(file,MYF(0));
 
4580
      fclose(file);
4581
4581
      die("Out of memory");
4582
4582
 
4583
4583
    }
4584
4584
    embedded_server_arg_count++;
4585
4585
  }
4586
 
  my_fclose(file,MYF(0));
 
4586
  fclose(file);
4587
4587
  if (str)
4588
4588
    die("Too many arguments in option file: %s",name);
4589
4589
 
4611
4611
    }
4612
4612
    fn_format(buff, argument, "", "", MY_UNPACK_FILENAME);
4613
4613
    assert(cur_file == file_stack && cur_file->file == 0);
4614
 
    if (!(cur_file->file=
4615
 
          my_fopen(buff, O_RDONLY, MYF(0))))
 
4614
    if (!(cur_file->file= fopen(buff, "r")))
4616
4615
      die("Could not open '%s' for reading: errno = %d", buff, errno);
4617
4616
    if (!(cur_file->file_name= strdup(buff)))
4618
4617
      die("Out of memory");