- Commit merged files (just changing some ending CRLF to LF)

modified:
  storage/connect/json.cpp
  storage/connect/xobject.cpp

storage/connect/json.cpp

@@ -725,12 +725,13 @@ bool JOUTFILE::Escape(const char *s)
 
   for (unsigned int i = 0; i < strlen(s); i++)
     switch (s[i]) {
-      case '\t': fputs("\\t", Stream); break;
-      case '\n': fputs("\\n", Stream); break;
-      case '\r': fputs("\\r", Stream); break;
-      case '\b': fputs("\\b", Stream); break;
-      case '\f': fputs("\\f", Stream); break;
-      case '"': fputs("\\\"", Stream); break;
+      case '\t': fputs("\\t",  Stream); break;
+      case '\n': fputs("\\n",  Stream); break;
+      case '\r': fputs("\\r",  Stream); break;
+      case '\b': fputs("\\b",  Stream); break;
+      case '\f': fputs("\\f",  Stream); break;
+      case '\\': fputs("\\\\", Stream); break;
+      case '"':  fputs("\\\"", Stream); break;
       default:
         fputc(s[i], Stream);
         break;

storage/connect/xobject.cpp

@@ -355,20 +355,20 @@ bool STRING::Append_quoted(PSZ s)
 
   if (s) for (char *p = s; !b && *p; p++)
     switch (*p) {
-      case '\'':
-      case '\\':
-      case '\t':
-      case '\n':
-      case '\r':
-      case '\b':
-      case '\f': b |= Append('\\');
-        // passthru
-      default:
-        b |= Append(*p);
-        break;
-      } // endswitch *p
-
-  return (b |= Append('\''));
+      case '\'':
+      case '\\':
+      case '\t':
+      case '\n':
+      case '\r':
+      case '\b':
+      case '\f': b |= Append('\\');
+        // passthru
+      default:
+        b |= Append(*p);
+        break;
+      } // endswitch *p
+
+  return (b |= Append('\''));
 } // end of Append_quoted
 
 /***********************************************************************/