← Back to branch summary

~hartmut-php/drizzle/codestyle

« back to all changes in this revision

Viewing changes to client/drizzle.cc

Merged from use-replace-funcs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
1698
1698
    }
1699
1699
    else
1700
1700
    {
1701
 
      char *prompt= (char*) (ml_comment ? "   /*> " :
1702
 
                             (glob_buffer->empty())
1703
 
                             ?  construct_prompt()
1704
 
                             : !in_string ? "    -> " :
1705
 
                             in_string == '\'' ?
1706
 
                             "    '> " : (in_string == '`' ?
1707
 
                                          "    `> " :
1708
 
                                          "    \"> "));
 
1701
      const char *prompt= (const char*) (ml_comment ? "   /*> " :
 
1702
                                         (glob_buffer->empty())
 
1703
                                         ?  construct_prompt()
 
1704
                                         : !in_string ? "    -> " :
 
1705
                                         in_string == '\'' ?
 
1706
                                         "    '> " : (in_string == '`' ?
 
1707
                                                      "    `> " :
 
1708
                                                      "    \"> "));
1709
1709
      if (opt_outfile && glob_buffer->empty())
1710
1710
        fflush(OUTFILE);
1711
1711
 
1803
1803
  for (uint i= 0; commands[i].name; i++)
1804
1804
  {
1805
1805
    if (commands[i].func &&
1806
 
        ((name && !my_strnncoll(charset_info,(uchar*)name,len, (uchar*)commands[i].name,len) && !commands[i].name[len] && (!end || (end && commands[i].takes_params))) || (!name && commands[i].cmd_char == cmd_char)))
 
1806
        ((name && !my_strnncoll(charset_info,(const uchar*)name,len, (const uchar*)commands[i].name,len) && !commands[i].name[len] && (!end || (end && commands[i].takes_params))) || (!name && commands[i].cmd_char == cmd_char)))
1807
1807
    {
1808
1808
      return(&commands[i]);
1809
1809
    }
2171
2171
static void initialize_readline (const char *name)
2172
2172
{
2173
2173
  /* Allow conditional parsing of the ~/.inputrc file. */
2174
 
  rl_readline_name= (char *)name;
 
2174
  rl_readline_name= (const char *)name;
2175
2175
 
2176
2176
  /* Tell the completer that we want a crack first. */
2177
2177
  rl_attempted_completion_function= (rl_completion_func_t*)&mysql_completion;