diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 13:59:27 +0200 | 
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2018-04-19 13:59:44 +0200 | 
| commit | 776505c2daa533b0887c7af36cb96e026037cdbe (patch) | |
| tree | b153e02f955deec0e1b23a08d8ccd6941092458d /NK_C_API.cc | |
| parent | 7a8550dbeda1d05a57a41e4aa0545c625f02ea7e (diff) | |
| download | libnitrokey-776505c2daa533b0887c7af36cb96e026037cdbe.tar.gz libnitrokey-776505c2daa533b0887c7af36cb96e026037cdbe.tar.bz2 | |
Change const char* to char* for functions returning duplicated strings.
All functions returning duplicated C-strings, which needs to be deallocated on caller side, are typed char* instead of const char*
Issue #110
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
Diffstat (limited to 'NK_C_API.cc')
| -rw-r--r-- | NK_C_API.cc | 30 | 
1 files changed, 15 insertions, 15 deletions
| diff --git a/NK_C_API.cc b/NK_C_API.cc index c398e95..ec9bfa5 100644 --- a/NK_C_API.cc +++ b/NK_C_API.cc @@ -71,7 +71,7 @@ uint8_t * get_with_array_result(T func){  }  template <typename T> -const char* get_with_string_result(T func){ +char* get_with_string_result(T func){      NK_last_command_status = 0;      try {          return func(); @@ -243,7 +243,7 @@ extern "C" {  	} -	NK_C_API const char * NK_status() { +	NK_C_API char * NK_status() {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			string && s = m->get_status_as_string(); @@ -253,7 +253,7 @@ extern "C" {  		});  	} -	NK_C_API const char * NK_device_serial_number() { +	NK_C_API char * NK_device_serial_number() {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			string && s = m->get_serial_number(); @@ -263,11 +263,11 @@ extern "C" {  		});  	} -	NK_C_API const char * NK_get_hotp_code(uint8_t slot_number) { +	NK_C_API char * NK_get_hotp_code(uint8_t slot_number) {  		return NK_get_hotp_code_PIN(slot_number, "");  	} -	NK_C_API const char * NK_get_hotp_code_PIN(uint8_t slot_number, const char *user_temporary_password) { +	NK_C_API char * NK_get_hotp_code_PIN(uint8_t slot_number, const char *user_temporary_password) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			string && s = m->get_HOTP_code(slot_number, user_temporary_password); @@ -277,12 +277,12 @@ extern "C" {  		});  	} -	NK_C_API const char * NK_get_totp_code(uint8_t slot_number, uint64_t challenge, uint64_t last_totp_time, +	NK_C_API char * NK_get_totp_code(uint8_t slot_number, uint64_t challenge, uint64_t last_totp_time,  		uint8_t last_interval) {  		return NK_get_totp_code_PIN(slot_number, challenge, last_totp_time, last_interval, "");  	} -	NK_C_API const char * NK_get_totp_code_PIN(uint8_t slot_number, uint64_t challenge, uint64_t last_totp_time, +	NK_C_API char * NK_get_totp_code_PIN(uint8_t slot_number, uint64_t challenge, uint64_t last_totp_time,  		uint8_t last_interval, const char *user_temporary_password) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() { @@ -327,14 +327,14 @@ extern "C" {  		});  	} -	NK_C_API const char* NK_get_totp_slot_name(uint8_t slot_number) { +	NK_C_API char* NK_get_totp_slot_name(uint8_t slot_number) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			const auto slot_name = m->get_totp_slot_name(slot_number);  			return slot_name;  		});  	} -	NK_C_API const char* NK_get_hotp_slot_name(uint8_t slot_number) { +	NK_C_API char* NK_get_hotp_slot_name(uint8_t slot_number) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			const auto slot_name = m->get_hotp_slot_name(slot_number); @@ -417,20 +417,20 @@ extern "C" {  		});  	} -	NK_C_API const char *NK_get_password_safe_slot_name(uint8_t slot_number) { +	NK_C_API char *NK_get_password_safe_slot_name(uint8_t slot_number) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			return m->get_password_safe_slot_name(slot_number);  		});  	} -	NK_C_API const char *NK_get_password_safe_slot_login(uint8_t slot_number) { +	NK_C_API char *NK_get_password_safe_slot_login(uint8_t slot_number) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			return m->get_password_safe_slot_login(slot_number);  		});  	} -	NK_C_API const char *NK_get_password_safe_slot_password(uint8_t slot_number) { +	NK_C_API char *NK_get_password_safe_slot_password(uint8_t slot_number) {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			return m->get_password_safe_slot_password(slot_number); @@ -589,14 +589,14 @@ extern "C" {  		});  	} -	NK_C_API const char* NK_get_status_storage_as_string() { +	NK_C_API char* NK_get_status_storage_as_string() {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			return m->get_status_storage_as_string();  		});  	} -	NK_C_API const char* NK_get_SD_usage_data_as_string() { +	NK_C_API char* NK_get_SD_usage_data_as_string() {  		auto m = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			return m->get_SD_usage_data_as_string(); @@ -631,7 +631,7 @@ extern "C" {  		});  	} -	NK_C_API const char* NK_list_devices_by_cpuID() { +	NK_C_API char* NK_list_devices_by_cpuID() {  		auto nm = NitrokeyManager::instance();  		return get_with_string_result([&]() {  			auto v = nm->list_devices_by_cpuID(); | 
