← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/system_table_ms.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 17:50:09 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704175009-0mgnno8qm97kvgn0
Remove String::c_ptr_quick()
Add standard C++ members begin, end, data and size to String
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/system_table_ms.cc
2105
2105
                alias = data + data_len + meta_name->length() + 1; // Set the alias to the value location.
2106
2106
        } else 
2107
2107
#endif
2108
 
                memcpy(data + data_len, meta_name.c_ptr_quick(), meta_name.length());
 
2108
                memcpy(data + data_len, meta_name.data(), meta_name.length());
2109
2109
                
2110
2110
        data_len += meta_name.length();
2111
2111
        data[data_len] = 0;
2112
2112
        data_len++;
2113
2113
 
2114
 
        memcpy(data + data_len, meta_value.c_ptr_quick(), meta_value.length());
 
2114
        memcpy(data + data_len, meta_value.data(), meta_value.length());
2115
2115
        data_len += meta_value.length();
2116
2116
        data[data_len] = 0;
2117
2117
        data_len++;
2349
2349
                alias = data + iMetDataSize + n_meta_name.length() + 1; // Set the alias to the value location.
2350
2350
        } else 
2351
2351
#endif
2352
 
                memcpy(data + iMetDataSize, n_meta_name.c_ptr_quick(), n_meta_name.length());
 
2352
                memcpy(data + iMetDataSize, n_meta_name.data(), n_meta_name.length());
2353
2353
                
2354
2354
        iMetDataSize += n_meta_name.length();
2355
2355
        data[iMetDataSize] = 0;
2356
2356
        iMetDataSize++;
2357
2357
 
2358
 
        memcpy(data + iMetDataSize, n_meta_value.c_ptr_quick(), n_meta_value.length());
 
2358
        memcpy(data + iMetDataSize, n_meta_value.data(), n_meta_value.length());
2359
2359
        iMetDataSize += n_meta_value.length();
2360
2360
        data[iMetDataSize] = 0;
2361
2361
        iMetDataSize++;