aboutsummaryrefslogtreecommitdiff
path: root/src/interfaces/odbc/misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces/odbc/misc.c')
-rw-r--r--src/interfaces/odbc/misc.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c
index 9c3c009b60c..2833a353530 100644
--- a/src/interfaces/odbc/misc.c
+++ b/src/interfaces/odbc/misc.c
@@ -169,10 +169,10 @@ my_strcpy(char *dst, int dst_len, char *src, int src_len)
return strlen(dst);
}
-/* strncpy copies up to len characters, and doesn't terminate */
-/* the destination string if src has len characters or more. */
-/* instead, I want it to copy up to len-1 characters and always */
-/* terminate the destination string. */
+// strncpy copies up to len characters, and doesn't terminate
+// the destination string if src has len characters or more.
+// instead, I want it to copy up to len-1 characters and always
+// terminate the destination string.
char *strncpy_null(char *dst, const char *src, int len)
{
int i;
@@ -199,9 +199,9 @@ int i;
return dst;
}
-/* Create a null terminated string (handling the SQL_NTS thing): */
-/* 1. If buf is supplied, place the string in there (assumes enough space) and return buf. */
-/* 2. If buf is not supplied, malloc space and return this string */
+// Create a null terminated string (handling the SQL_NTS thing):
+// 1. If buf is supplied, place the string in there (assumes enough space) and return buf.
+// 2. If buf is not supplied, malloc space and return this string
char *
make_string(char *s, int len, char *buf)
{
@@ -227,10 +227,10 @@ char *str;
return NULL;
}
-/* Concatenate a single formatted argument to a given buffer handling the SQL_NTS thing. */
-/* "fmt" must contain somewhere in it the single form '%.*s' */
-/* This is heavily used in creating queries for info routines (SQLTables, SQLColumns). */
-/* This routine could be modified to use vsprintf() to handle multiple arguments. */
+// Concatenate a single formatted argument to a given buffer handling the SQL_NTS thing.
+// "fmt" must contain somewhere in it the single form '%.*s'
+// This is heavily used in creating queries for info routines (SQLTables, SQLColumns).
+// This routine could be modified to use vsprintf() to handle multiple arguments.
char *
my_strcat(char *buf, char *fmt, char *s, int len)
{