From 86dc1b2b9b7bd8490f42ad5b44c8c5029c13948a Mon Sep 17 00:00:00 2001
From: chenxm <chenxm35@gmail.com>
Date: Thu, 25 Aug 2022 16:44:48 +0800
Subject: [PATCH] Resolve cpp keyword conflict

---
 kubernetes/config/kube_config_model.c | 6 +++---
 kubernetes/config/kube_config_model.h | 2 +-
 kubernetes/config/kube_config_yaml.c  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kubernetes/config/kube_config_model.c b/kubernetes/config/kube_config_model.c
index bdb6e54..8076c59 100644
--- a/kubernetes/config/kube_config_model.c
+++ b/kubernetes/config/kube_config_model.c
@@ -102,9 +102,9 @@ void kubeconfig_property_free(kubeconfig_property_t * property)
             free(property->cluster);
             property->cluster = NULL;
         }
-        if (property->namespace) {
-            free(property->namespace);
-            property->namespace = NULL;
+        if (property->_namespace) {
+            free(property->_namespace);
+            property->_namespace = NULL;
         }
         if (property->user) {
             free(property->user);
diff --git a/kubernetes/config/kube_config_model.h b/kubernetes/config/kube_config_model.h
index 69356a4..45833a2 100644
--- a/kubernetes/config/kube_config_model.h
+++ b/kubernetes/config/kube_config_model.h
@@ -45,7 +45,7 @@ extern "C" {
         union {
             struct {            /* context */
                 char *cluster;
-                char *namespace;
+                char *_namespace;
                 char *user;
             };
             struct {            /* cluster */
diff --git a/kubernetes/config/kube_config_yaml.c b/kubernetes/config/kube_config_yaml.c
index 61a0ba0..5c385f9 100644
--- a/kubernetes/config/kube_config_yaml.c
+++ b/kubernetes/config/kube_config_yaml.c
@@ -202,7 +202,7 @@ static int parse_kubeconfig_yaml_property_mapping(kubeconfig_property_t * proper
                 if (0 == strcmp(key->data.scalar.value, KEY_CLUSTER)) {
                     property->cluster = strdup(value->data.scalar.value);
                 } else if (0 == strcmp(key->data.scalar.value, KEY_NAMESPACE)) {
-                    property->namespace = strdup(value->data.scalar.value);
+                    property->_namespace = strdup(value->data.scalar.value);
                 } else if (0 == strcmp(key->data.scalar.value, KEY_USER)) {
                     property->user = strdup(value->data.scalar.value);
                 }
@@ -802,8 +802,8 @@ static int append_key_map_to_mapping_node(yaml_document_t * output_document, int
         }
 
         /* Add 'namespace': '' */
-        if (property->namespace) {
-            if (-1 == append_key_stringvalue_to_mapping_node(output_document, map, KEY_NAMESPACE, property->namespace)) {
+        if (property->_namespace) {
+            if (-1 == append_key_stringvalue_to_mapping_node(output_document, map, KEY_NAMESPACE, property->_namespace)) {
                 return -1;
             }
         }