diff options
author | unknown <marko@hundin.mysql.fi> | 2004-05-17 14:40:31 +0300 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2004-05-17 14:40:31 +0300 |
commit | 6b237533f1baae131e192ccbafcfcfaef13f4fc0 (patch) | |
tree | 17e1fcb0d47194292389b6b6d5d0b78c2695e328 /innobase/pars | |
parent | 1915bfebcb9005102c72028221bb89aa5f0204e4 (diff) | |
download | mariadb-git-6b237533f1baae131e192ccbafcfcfaef13f4fc0.tar.gz |
InnoDB cleanup: Add const qualifiers to many char* arguments
innobase/dict/dict0dict.c:
Replace char* arguments with const char*
innobase/dict/dict0load.c:
Replace char* arguments with const char*
innobase/dict/dict0mem.c:
Replace char* arguments with const char*
innobase/fil/fil0fil.c:
Replace char* arguments with const char*
innobase/include/data0data.h:
dfield_set_data(): add const qualifier
innobase/include/data0data.ic:
dfield_set_data(): add const qualifier
(temporarily shut up compiler warnings)
innobase/include/dict0dict.h:
Replace char* arguments with const char*
innobase/include/dict0dict.ic:
Replace char* arguments with const char*
innobase/include/dict0load.h:
Replace char* arguments with const char*
innobase/include/dict0mem.h:
Replace char* arguments with const char*
innobase/include/fil0fil.h:
Replace char* arguments with const char*
innobase/include/os0file.h:
Replace char* arguments with const char*
innobase/include/os0sync.h:
Replace char* arguments with const char*
innobase/include/pars0pars.h:
Replace char* arguments with const char*
innobase/include/pars0sym.h:
Replace char* arguments with const char*
innobase/include/row0mysql.h:
Replace char* arguments with const char*
innobase/include/row0sel.h:
Replace char* arguments with const char*
innobase/include/trx0roll.h:
Replace char* arguments with const char*
innobase/include/trx0sys.h:
Replace char* arguments with const char*
innobase/include/trx0trx.h:
Replace char* arguments with const char*
innobase/include/ut0rnd.h:
Replace char* arguments with const char*
innobase/include/ut0rnd.ic:
Replace char* arguments with const char*
innobase/include/ut0ut.h:
Remove unused function ut_printf()
innobase/os/os0file.c:
Replace char* arguments with const char*
innobase/os/os0sync.c:
Replace char* arguments with const char*
innobase/pars/pars0pars.c:
Replace char* arguments with const char*
innobase/pars/pars0sym.c:
Use mem_heap_strdupl() instead of mem_heap_alloc() and memcpy()
innobase/row/row0mysql.c:
Replace char* arguments with const char*
innobase/row/row0sel.c:
Replace char* arguments with const char*
innobase/trx/trx0roll.c:
Replace char* arguments with const char*
innobase/trx/trx0sys.c:
Replace char* arguments with const char*
Diffstat (limited to 'innobase/pars')
-rw-r--r-- | innobase/pars/pars0pars.c | 4 | ||||
-rw-r--r-- | innobase/pars/pars0sym.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/innobase/pars/pars0pars.c b/innobase/pars/pars0pars.c index 7e835d9ada1..12451b4d94d 100644 --- a/innobase/pars/pars0pars.c +++ b/innobase/pars/pars0pars.c @@ -1729,8 +1729,8 @@ Parses an SQL string returning the query graph. */ que_t* pars_sql( /*=====*/ - /* out, own: the query graph */ - char* str) /* in: SQL string */ + /* out, own: the query graph */ + const char* str) /* in: SQL string */ { sym_node_t* sym_node; mem_heap_t* heap; diff --git a/innobase/pars/pars0sym.c b/innobase/pars/pars0sym.c index 1a0608ed142..194e6677183 100644 --- a/innobase/pars/pars0sym.c +++ b/innobase/pars/pars0sym.c @@ -217,13 +217,10 @@ sym_tab_add_id( node->common.type = QUE_NODE_SYMBOL; - node->name = mem_heap_alloc(sym_tab->heap, len + 1); node->resolved = FALSE; node->indirection = NULL; - ut_memcpy(node->name, name, len); - node->name[len] = '\0'; - + node->name = mem_heap_strdupl(sym_tab->heap, name, len + 1); node->name_len = len; UT_LIST_ADD_LAST(sym_list, sym_tab->sym_list, node); |