summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLenny Komow <lenny@lunarg.com>2018-11-12 11:02:23 -0700
committerLenny Komow <lenny@lunarg.com>2018-11-12 11:35:15 -0700
commit8d4be318b420d8a42227f6e38d13ba0884bd3a45 (patch)
tree0231bcfdd5905509c7290e38fd703db4621c799b
parent8f733797e5de4595ada12db7078abdeebeac6c6f (diff)
downloadVulkan-Loader-8d4be318b420d8a42227f6e38d13ba0884bd3a45.tar.gz
Vulkan-Loader-8d4be318b420d8a42227f6e38d13ba0884bd3a45.tar.bz2
Vulkan-Loader-8d4be318b420d8a42227f6e38d13ba0884bd3a45.zip
loader: Fix override expiration functionality
Change-Id: Ib2415cb1a9218930dc68827abdd1587bd0672342
-rw-r--r--loader/loader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c
index a20f9181..215a9d70 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1589,7 +1589,7 @@ static bool checkExpiration(const struct loader_instance *inst, const struct loa
.tm_min = prop->expiration.minute,
.tm_hour = prop->expiration.hour,
.tm_mday = prop->expiration.day,
- .tm_mon = prop->expiration.month,
+ .tm_mon = prop->expiration.month - 1,
.tm_year = prop->expiration.year - 1900,
.tm_isdst = tm_current.tm_isdst,
// wday and yday are ignored by mktime
@@ -2694,7 +2694,7 @@ static VkResult loaderReadLayerJson(const struct loader_instance *inst, struct l
}
props->is_override = true;
- expiration = cJSON_GetObjectItem(layer_node, "expiration");
+ expiration = cJSON_GetObjectItem(layer_node, "expiration_date");
if (NULL != expiration) {
char date_copy[32];
uint8_t cur_item = 0;
@@ -2703,7 +2703,7 @@ static VkResult loaderReadLayerJson(const struct loader_instance *inst, struct l
temp = cJSON_Print(expiration);
if (temp == NULL) {
loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0,
- "Problem accessing layer value 'expiration' in manifest JSON file, skipping this layer");
+ "Problem accessing layer value 'expiration_date' in manifest JSON file, skipping this layer");
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto out;
}