Modified for -pedantic and POSIX compliance checks

Author: rlillback

agent.c

@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <time.h>
 #include <unistd.h>
 #include <getopt.h>

agent.h

@@ -9,10 +9,11 @@
 /* thespecific language governing permissions and limitations under the       */
 /* License.                                                                   */
 /******************************************************************************/
-
 #ifndef AGENT_H_
 #define AGENT_H_
 
+#define _POSIX_C_SOURCE 200809L   // POSIX.1-2008
+
 #include "session.h"
 #include "schedule.h"
 #include "config.h"

config.c

@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <time.h>
 #include "config.h"

config.h

@@ -12,6 +12,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#define _POSIX_C_SOURCE 200809L   // POSIX.1-2008
+
 #include <stdbool.h>
 #include <stddef.h>
 

constants.h

@@ -9,10 +9,11 @@
 /* thespecific language governing permissions and limitations under the       */
 /* License.                                                                   */
 /******************************************************************************/
-
 #ifndef __CONSTANTS_H__
 #define __CONSTANTS_H__
 
+#define _POSIX_C_SOURCE 200809L   // POSIX.1-2008
+
 /* These are the GUIDs of the capabilities supported by the Agent */
 #define CAP_PEM_INVENTORY "a809ce1f-1eea-4738-a38e-15708c89c981"
 #define CAP_PEM_MANAGEMENT "1d411b36-ae72-433f-9f3f-8593e836a1af"

csr.c

@@ -11,6 +11,7 @@
 /******************************************************************************/
 
 #include <string.h>
+#include <strings.h>
 #include "csr.h"
 #include "logging.h"
 #include "global.h"

csr.h

@@ -9,10 +9,11 @@
 /* thespecific language governing permissions and limitations under the       */
 /* License.                                                                   */
 /******************************************************************************/
-
 #ifndef __CSR_H__
 #define __CSR_H__
 
+#define _POSIX_C_SOURCE 200809L   // POSIX.1-2008
+
 #include "dto.h"
 #include "config.h"
 

dto.c

@@ -17,6 +17,7 @@
 #include "lib/json.h"
 #include "logging.h"
 #include <string.h>
+#include <strings.h>
 #include <stdbool.h>
 
 /******************************************************************************/
@@ -317,9 +318,9 @@ SessionRegisterReq_t *SessionRegisterReq_new(char *clientParamPath)
                 json_foreach(curNode, jsonRoot) {
                     if (curNode->tag == JSON_STRING &&
                         curNode->key &&
-                        curNode->string_) {
+                        curNode->u.string_) {
                         req->ClientParameters[nodeCount++] =
-                            ClientParameter_new(curNode->key, curNode->string_);
+                            ClientParameter_new(curNode->key, curNode->u.string_);
                     }
                 }
 
@@ -718,9 +719,9 @@ SessionRegisterResp_t *SessionRegisterResp_fromJson(char *jsonString)
                     current = 0;
                     json_foreach(jsonTmp, jsonParams) {
                         if (jsonTmp && jsonTmp->tag == JSON_STRING &&
-                            jsonTmp->string_) {
+                            jsonTmp->u.string_) {
                             resp->Session.ClientParameters[current++] =
-                                ClientParameter_new(jsonTmp->key, jsonTmp->string_);
+                                ClientParameter_new(jsonTmp->key, jsonTmp->u.string_);
                         }
                     }
                     resp->Session.ClientParameters_count = current;
@@ -1537,10 +1538,10 @@ EnrollmentConfigResp_t *EnrollmentConfigResp_fromJson(char *jsonString)
 
             JsonNode *keySizeNode = json_find_member(jsonRoot, "KeySize");
             if (keySizeNode && keySizeNode->tag == JSON_NUMBER) {
-                resp->KeySize = keySizeNode->number_;
+                resp->KeySize = keySizeNode->u.number_;
             } else if (keySizeNode && keySizeNode->tag == JSON_STRING) {
                 int tmp;
-                if (sscanf(keySizeNode->string_, "%d", &tmp) == 1) {
+                if (sscanf(keySizeNode->u.string_, "%d", &tmp) == 1) {
                     resp->KeySize = tmp;
                 }
             }

dto.h

@@ -9,10 +9,11 @@
 /* thespecific language governing permissions and limitations under the       */
 /* License.                                                                   */
 /******************************************************************************/
-
 #ifndef CSS_DTO_H
 #define CSS_DTO_H
 
+#define _POSIX_C_SOURCE 200809L   // POSIX.1-2008
+
 #include <stdbool.h>
 #include <stdint.h>
 #include "constants.h"

enrollment.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "lib/base64.h"
 #include "enrollment.h"
 #include "httpclient.h"