← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Stewart Smith
  • Date: 2009-12-02 06:01:21 UTC
  • mto: (1237.1.2 push)
  • mto: This revision was merged to the branch mainline in revision 1238.
  • Revision ID: stewart@flamingspork.com-20091202060121-68gyfqifqcjcmi2v
my_end() no longer requires an argument (we removed them all)

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
192
192
static bool preserve_comments= false;
193
193
static uint32_t opt_max_input_line, opt_drizzle_port= 0;
194
194
static int verbose= 0, opt_silent= 0, opt_local_infile= 0;
195
 
static uint32_t my_end_arg;
196
195
static char * opt_drizzle_unix_port= NULL;
197
196
static drizzle_capabilities_t connect_flag= DRIZZLE_CAPABILITIES_NONE;
198
197
static char *current_host, *current_db, *current_user= NULL,
1223
1222
  if (get_options(argc, (char **) argv))
1224
1223
  {
1225
1224
    free_defaults(defaults_argv);
1226
 
    my_end(0);
 
1225
    my_end();
1227
1226
    exit(1);
1228
1227
  }
1229
1228
 
1241
1240
  {
1242
1241
    /* we've executed a command so exit before we go into readline mode */
1243
1242
    free_defaults(defaults_argv);
1244
 
    my_end(0);
 
1243
    my_end();
1245
1244
    exit(command_error);
1246
1245
  }
1247
1246
 
1251
1250
    if (status.line_buff == NULL)
1252
1251
    {
1253
1252
      free_defaults(defaults_argv);
1254
 
      my_end(0);
 
1253
      my_end();
1255
1254
      exit(1);
1256
1255
    }
1257
1256
  }
1368
1367
  free(default_prompt);
1369
1368
  free(current_prompt);
1370
1369
  free_defaults(defaults_argv);
1371
 
  my_end(my_end_arg);
 
1370
  my_end();
1372
1371
  exit(status.exit_status);
1373
1372
}
1374
1373
 
1699
1698
      status.line_buff= new(std::nothrow) LineBuffer(opt_max_input_line,NULL);
1700
1699
    if (status.line_buff == NULL)
1701
1700
    {
1702
 
      my_end(0);
 
1701
      my_end();
1703
1702
      exit(1);
1704
1703
    }
1705
1704
    status.line_buff->addString(argument);