MonetDB: Jun2020 - Simplify, use strdup instead of malloc + strcpy

[Pedro Ferreira]

Changeset: 62f01afff3c1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=62f01afff3c1
Modified Files:
        sql/server/rel_psm.c
        sql/server/rel_updates.c
Branch: Jun2020
Log Message:

Simplify, use strdup instead of malloc + strcpy


diffs (36 lines):

diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1459,10 +1459,8 @@ create_table_from_loader(sql_query *quer
        if (!rel || !loader)
                return NULL;
 
-       loader->sname = sname ? sa_zalloc(sql->sa, strlen(sname) + 1) : NULL;
-       loader->tname = tname ? sa_zalloc(sql->sa, strlen(tname) + 1) : NULL;
-       if (sname) strcpy(loader->sname, sname);
-       if (tname) strcpy(loader->tname, tname);
+       loader->sname = sname ? sa_strdup(sql->sa, sname) : NULL;
+       loader->tname = tname ? sa_strdup(sql->sa, tname) : NULL;
 
        return rel;
 }
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1917,14 +1917,11 @@ copyfromloader(sql_query *query, dlist *
        if (!rel || !loader)
                return NULL;
 
-       loader->sname = sname ? sa_zalloc(sql->sa, strlen(sname) + 1) : NULL;
-       loader->tname = tname ? sa_zalloc(sql->sa, strlen(tname) + 1) : NULL;
+       loader->sname = sname ? sa_strdup(sql->sa, sname) : NULL;
+       loader->tname = tname ? sa_strdup(sql->sa, tname) : NULL;
        loader->coltypes = table_column_types(sql->sa, t);
        loader->colnames = table_column_names_and_defaults(sql->sa, t);
 
-       if (sname) strcpy(loader->sname, sname);
-       if (tname) strcpy(loader->tname, tname);
-
        return rel;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list