← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.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/item/ident.cc
92
92
    return field_name ? field_name : name ? name : "tmp_field";
93
93
  if (db_name && db_name[0])
94
94
  {
95
 
    tmp=(char*) sql_alloc((uint) strlen(db_name)+(uint) strlen(table_name)+
96
 
                          (uint) strlen(field_name)+3);
 
95
    tmp=(char*) sql_alloc((uint32_t) strlen(db_name)+(uint32_t) strlen(table_name)+
 
96
                          (uint32_t) strlen(field_name)+3);
97
97
    sprintf(tmp,"%s.%s.%s",db_name,table_name,field_name);
98
98
  }
99
99
  else
100
100
  {
101
101
    if (table_name[0])
102
102
    {
103
 
      tmp= (char*) sql_alloc((uint) strlen(table_name) +
104
 
                             (uint) strlen(field_name) + 2);
 
103
      tmp= (char*) sql_alloc((uint32_t) strlen(table_name) +
 
104
                             (uint32_t) strlen(field_name) + 2);
105
105
      sprintf(tmp, "%s.%s", table_name, field_name);
106
106
    }
107
107
    else
140
140
  {
141
141
    const char *nm= (field_name && field_name[0]) ?
142
142
                      field_name : name ? name : "tmp_field";
143
 
    str->append_identifier(nm, (uint) strlen(nm));
 
143
    str->append_identifier(nm, (uint32_t) strlen(nm));
144
144
 
145
145
    return;
146
146
  }
152
152
    }
153
153
    str->append_identifier(t_name.c_str(), t_name.length());
154
154
    str->append('.');
155
 
    str->append_identifier(field_name, (uint)strlen(field_name));
 
155
    str->append_identifier(field_name, (uint32_t)strlen(field_name));
156
156
  }
157
157
  else
158
158
  {
160
160
    {
161
161
      str->append_identifier(t_name.c_str(), t_name.length());
162
162
      str->append('.');
163
 
      str->append_identifier(field_name, (uint) strlen(field_name));
 
163
      str->append_identifier(field_name, (uint32_t) strlen(field_name));
164
164
    }
165
165
    else
166
 
      str->append_identifier(field_name, (uint) strlen(field_name));
 
166
      str->append_identifier(field_name, (uint32_t) strlen(field_name));
167
167
  }
168
168
}
169
169