From ce7d5d85da3b16d2d01d7522224252a6af7a69e6 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 11 Aug 2018 23:40:49 -0400
Subject: [PATCH] main, npdm: Make parameters/members const where applicable

The data pointed to isn't modified and in the case of char*, resolves
-Wdiscarded-qualifiers warnings, as string literals are const char* and
are used with the relevant functions.
---
 main.c |  2 +-
 npdm.c | 12 ++++++------
 npdm.h | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index 2902a03..86394e8 100644
--- a/main.c
+++ b/main.c
@@ -14,7 +14,7 @@
 #include "packages.h"
 #include "nso.h"
 
-static char *prog_name = "hactool";
+static const char *prog_name = "hactool";
 
 /* Print usage. Taken largely from ctrtool. */
 static void usage(void) {
diff --git a/npdm.c b/npdm.c
index c46a6be..389608f 100644
--- a/npdm.c
+++ b/npdm.c
@@ -266,7 +266,7 @@ void kac_add_mmio(kac_t *kac, kac_mmio_t *mmio) {
     }
 }
 
-void kac_print(uint32_t *descriptors, uint32_t num_descriptors) {
+void kac_print(const uint32_t *descriptors, uint32_t num_descriptors) {
     kac_t kac;
     kac_mmio_t *cur_mmio = NULL;
     kac_mmio_t *page_mmio = NULL;
@@ -681,25 +681,25 @@ void npdm_save(npdm_t *npdm, hactool_ctx_t *tool_ctx) {
     fclose(f_json);
 }
 
-void cJSON_AddU8ToObject(cJSON *obj, char *name, uint8_t val) {
+void cJSON_AddU8ToObject(cJSON *obj, const char *name, uint8_t val) {
     char buf[0x20] = {0};
     snprintf(buf, sizeof(buf), "0x%02"PRIx8, val);
     cJSON_AddStringToObject(obj, name, buf);
 }
 
-void cJSON_AddU16ToObject(cJSON *obj, char *name, uint16_t val) {
+void cJSON_AddU16ToObject(cJSON *obj, const char *name, uint16_t val) {
     char buf[0x20] = {0};
     snprintf(buf, sizeof(buf), "0x%04"PRIx16, val & 0xFFFF);
     cJSON_AddStringToObject(obj, name, buf);
 }
 
-void cJSON_AddU32ToObject(cJSON *obj, char *name, uint32_t val) {
+void cJSON_AddU32ToObject(cJSON *obj, const char *name, uint32_t val) {
     char buf[0x20] = {0};
     snprintf(buf, sizeof(buf), "0x%08"PRIx16, val);
     cJSON_AddStringToObject(obj, name, buf);
 }
 
-void cJSON_AddU64ToObject(cJSON *obj, char *name, uint64_t val) {
+void cJSON_AddU64ToObject(cJSON *obj, const char *name, uint64_t val) {
     char buf[0x20] = {0};
     snprintf(buf, sizeof(buf), "0x%016"PRIx64, val);
     cJSON_AddStringToObject(obj, name, buf);
@@ -723,7 +723,7 @@ cJSON *sac_get_json(char *sac, uint32_t sac_size) {
     return sac_json;
 }
 
-cJSON *kac_get_json(uint32_t *descriptors, uint32_t num_descriptors) {
+cJSON *kac_get_json(const uint32_t *descriptors, uint32_t num_descriptors) {
     cJSON *kac_json = cJSON_CreateObject();
     cJSON *temp = NULL;
     bool first_syscall = false;
diff --git a/npdm.h b/npdm.h
index c85645e..2248421 100644
--- a/npdm.h
+++ b/npdm.h
@@ -71,7 +71,7 @@ typedef struct {
 #pragma pack(pop)
 
 typedef struct {
-    char *name;
+    const char *name;
     uint64_t mask;
 } fs_perm_t;
 
@@ -138,14 +138,14 @@ void npdm_print(npdm_t *npdm, hactool_ctx_t *tool_ctx);
 void npdm_save(npdm_t *npdm, hactool_ctx_t *tool_ctx);
 
 char *npdm_get_proc_category(int process_category);
-void kac_print(uint32_t *descriptors, uint32_t num_descriptors);
+void kac_print(const uint32_t *descriptors, uint32_t num_descriptors);
 char *npdm_get_json(npdm_t *npdm);
 
-void cJSON_AddU8ToObject(cJSON *obj, char *name, uint8_t val);
-void cJSON_AddU16ToObject(cJSON *obj, char *name, uint16_t val);
-void cJSON_AddU32ToObject(cJSON *obj, char *name, uint32_t val);
-void cJSON_AddU64ToObject(cJSON *obj, char *name, uint64_t val);
-cJSON *kac_get_json(uint32_t *descriptors, uint32_t num_descriptors);
+void cJSON_AddU8ToObject(cJSON *obj, const char *name, uint8_t val);
+void cJSON_AddU16ToObject(cJSON *obj, const char *name, uint16_t val);
+void cJSON_AddU32ToObject(cJSON *obj, const char *name, uint32_t val);
+void cJSON_AddU64ToObject(cJSON *obj, const char *name, uint64_t val);
+cJSON *kac_get_json(const uint32_t *descriptors, uint32_t num_descriptors);
 
 
 #endif