diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-11-22 16:15:57 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-11-22 16:15:57 +0100 |
| commit | 8a860fda0c1b0c9fda2fcddc0d3392a20d76a9d8 (patch) | |
| tree | d7b97b5042bfeef645fc80daf15220be90423cc3 /storage/connect/tabxml.cpp | |
| parent | 1d239d8c94106561a017c7534674003042180015 (diff) | |
| download | mariadb-git-8a860fda0c1b0c9fda2fcddc0d3392a20d76a9d8.tar.gz | |
Remove commented lines.
modified: storage/connect/value.cpp
Avoid warning on redefined XSTR
modified: storage/connect/tabxml.cpp
Diffstat (limited to 'storage/connect/tabxml.cpp')
| -rw-r--r-- | storage/connect/tabxml.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp index 9c47829d5bc..57d204a4286 100644 --- a/storage/connect/tabxml.cpp +++ b/storage/connect/tabxml.cpp @@ -60,7 +60,7 @@ extern "C" char version[]; #endif // !__WIN__ #define TYPE_UNKNOWN 12 /* Must be greater than other types */ -#define XSTR(M) sizeof(M) - strlen(M) - 1 /* To avoid overflow*/ +#define XLEN(M) sizeof(M) - strlen(M) - 1 /* To avoid overflow*/ /***********************************************************************/ /* Class and structure used by XMLColumns. */ @@ -226,30 +226,30 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info) more: if (vp->atp) { strncpy(colname, vp->atp->GetName(g), sizeof(colname)); - strncat(xcol->Name, colname, XSTR(xcol->Name)); + strncat(xcol->Name, colname, XLEN(xcol->Name)); switch (vp->atp->GetText(g, buf, sizeof(buf))) { case RC_INFO: PushWarning(g, txmp); case RC_OK: - strncat(fmt, "@", XSTR(fmt)); + strncat(fmt, "@", XLEN(fmt)); break; default: goto err; } // enswitch rc if (j) - strncat(fmt, colname, XSTR(fmt)); + strncat(fmt, colname, XLEN(fmt)); } else { if (tdp->Usedom && node->GetType() != 1) continue; strncpy(colname, node->GetName(g), sizeof(colname)); - strncat(xcol->Name, colname, XSTR(xcol->Name)); + strncat(xcol->Name, colname, XLEN(xcol->Name)); if (j) - strncat(fmt, colname, XSTR(fmt)); + strncat(fmt, colname, XLEN(fmt)); if (j < lvl && ok) { vp = lvlp[j+1]; @@ -267,9 +267,9 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info) if (!vp->atp) node = vp->nl->GetItem(g, vp->k++, node); - strncat(fmt, colname, XSTR(fmt)); - strncat(fmt, "/", XSTR(fmt)); - strncat(xcol->Name, "_", XSTR(xcol->Name)); + strncat(fmt, colname, XLEN(fmt)); + strncat(fmt, "/", XLEN(fmt)); + strncat(xcol->Name, "_", XLEN(xcol->Name)); j++; vp->n = (int)strlen(xcol->Name); vp->m = (int)strlen(fmt); |