← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
446
446
      end -= post_skip;
447
447
      assert(end >= str);
448
448
 
449
 
      if (!(start= (char*) lip->m_session->alloc((uint) (end-str)+1)))
 
449
      if (!(start= (char*) lip->m_session->alloc((uint32_t) (end-str)+1)))
450
450
        return (char*) "";              // Sql_alloc has set error flag
451
451
 
452
452
      lip->m_cpp_text_start= lip->get_cpp_tok_start() + pre_skip;
454
454
 
455
455
      if (!found_escape)
456
456
      {
457
 
        lip->yytoklen=(uint) (end-str);
 
457
        lip->yytoklen=(uint32_t) (end-str);
458
458
        memcpy(start,str,lip->yytoklen);
459
459
        start[lip->yytoklen]=0;
460
460
      }
510
510
            *to++ = *str;
511
511
        }
512
512
        *to=0;
513
 
        lip->yytoklen=(uint) (to-start);
 
513
        lip->yytoklen=(uint32_t) (to-start);
514
514
      }
515
515
      return start;
516
516
    }