Merge remote-tracking branch 'origin/main' into rework-logging

ThePrez · Aug 20, 2024 · b0086b4 · b0086b4
2 parents 23d40a2 + c943236
commit b0086b4
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 8 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,24 @@
+{
+  "configurations": [
+    {
+      "name": "Mac",
+      "includePath": ["${workspaceFolder}/**"],
+      "defines": ["MANZAN_VERSION", "MANZAN_BUILDDATE", "__EXTENDED__"],
+      "compilerPath": "/usr/bin/clang",
+      "cStandard": "c99",
+      "cppStandard": "c++11",
+      "intelliSenseMode": "macos-clang-arm64"
+    },
+    {
+      "name": "Win32",
+      "includePath": ["${workspaceFolder}/**"],
+      "defines": ["MANZAN_VERSION", "MANZAN_BUILDDATE", "__EXTENDED__"],
+      "windowsSdkVersion": "10.0.22621.0",
+      "compilerPath": "cl.exe",
+      "cStandard": "c99",
+      "cppStandard": "c++11",
+      "intelliSenseMode": "windows-msvc-x64"
+    }
+  ],
+  "version": 4
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,107 @@
+{
+    "files.eol": "\n",
+    "files.associations": {
+        "*.COBOL*": "cobol",
+        "*.COB*": "cobol",
+        "*.COBCOPY*": "cobol",
+        "*.COPYBOOK*": "cobol",
+        "*.COPY*": "cobol",
+        "*.PL1*": "pl1",
+        "*.PLI*": "pl1",
+        "*.INC*": "pl1",
+        "*.INCLUDE*": "pl1",
+        "*.JCL*": "jcl",
+        "*.ASM*": "hlasm",
+        "*.ASSEMBLE*": "hlasm",
+        "*.HLASM*": "hlasm",
+        "*.HLA*": "hlasm",
+        "*.MACLIB*": "hlasm",
+        "*.EXEC*": "rexx",
+        "*.REXX*": "rexx",
+        "*.REXXINC*": "rexx",
+        "*.copyasm": "hlasm",
+        "*.macasm": "hlasm",
+        "*.bms": "hlasm",
+        "*.rex": "rexx",
+        "*.rexx": "rexx",
+        "*.sqlc": "cpp",
+        "string": "cpp",
+        "__bit_reference": "cpp",
+        "__bits": "cpp",
+        "__config": "cpp",
+        "__debug": "cpp",
+        "__errc": "cpp",
+        "__hash_table": "cpp",
+        "__locale": "cpp",
+        "__mutex_base": "cpp",
+        "__node_handle": "cpp",
+        "__split_buffer": "cpp",
+        "__threading_support": "cpp",
+        "__tree": "cpp",
+        "__tuple": "cpp",
+        "__verbose_abort": "cpp",
+        "any": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "complex": "cpp",
+        "condition_variable": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "set": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stack": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "variant": "cpp",
+        "vector": "cpp",
+        "__nullptr": "cpp",
+        "__string": "cpp",
+        "chrono": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "algorithm": "cpp"
+    }
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,15 +11,17 @@ We welcome everyone to work on this cool project. We use a typical PR system:
 ### Visual Studio Code
 
 1. Clone your fork to your local machine
-2. Open the repository up in Visual Studio Code
-3. Connect to a remote IBM i where the build can happen
-4. Correctly set your current library to where your objects can be built
+2. From the command palette, select `c/c++: Select a Configuration...`, and choose the configuration corresponding to your OS
+3. Run the downloadIbmiHeader utility on the ile folder to download the relevant headers to your local system: https://github.ibm.com/ibmi-toronto/downloadIBMiHeader
+4. Open the repository up in Visual Studio Code
+5. Connect to a remote IBM i where the build can happen
+6. Correctly set your current library to where your objects can be built
    * Code for IBM i will tell you what you have it set to when you have connected to a system.
-5. Set your Deploy Workspace Location in the IFS
+7. Set your Deploy Workspace Location in the IFS
    * Code for IBM i can set a default location if you have not yet done it before, OR
    * Right click on the chosen directory and select 'Set Deploy Workspace Location'.
    * You only have to do this once.
-6. Actions are available to compile source from your local machine
+8. Actions are available to compile source from your local machine
    * Control / Command + E
 
 

diff --git a/ile/src/handler.cpp b/ile/src/handler.cpp
@@ -45,11 +45,11 @@ std::string get_iso8601_timestamp(const char *_in)
   memset(err, 0, sizeof(err));
   QWCCVTDT(
       // 1 	Input format 	Input 	Char(10)
-      "*DTS      ",
+      (void *)"*DTS      ",
       // 2 	Input variable 	Input 	Char(*)
       (void *)_in,
       // 3 	Output format 	Input 	Char(10)
-      "*YYMD     ",
+      (void *)"*YYMD     ",
       // 4 	Output variable 	Output 	Char(*)
       output,
       // 5 	Error code 	I/O 	Char(*)
@@ -135,7 +135,7 @@ int main(int _argc, char **argv)
     memcpy(qualified_msg_file, msg_event->message_file_name, 10);
     memcpy(qualified_msg_file+10, msg_event->message_file_library, 10);
     DEBUG_INFO("MESSAGE FILE AND NAME IS '%s'\n", qualified_msg_file);
-    char *replacement_data = (0 == replacement_data_len) ? "" : (((char *)msg_event) + replacement_data_offset);
+    char *replacement_data = (0 == replacement_data_len) ? (char *)"" : (((char *)msg_event) + replacement_data_offset);
     char *replacement_data_aligned = (char *)malloc(1+replacement_data_len);
     memset(replacement_data_aligned, 0x00, 1+replacement_data_len);
     memcpy(replacement_data_aligned, replacement_data, (size_t)replacement_data_len);