Skip to content

Commit 8a50976

Browse files
committed
cleanup api defenitions on wchar* usage
1 parent f564fb9 commit 8a50976

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

include/gw2al_api.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ typedef enum gw2al_log_level {
5656

5757
typedef struct gw2al_core_vtable {
5858
//converts string to hash for usage in other functions
59-
gw2al_hashed_name (*hash_name)(wchar_t* name);
59+
gw2al_hashed_name (*hash_name)(const wchar_t* name);
6060

6161
//register/unregister user functions to be called by other addons
6262
gw2al_api_ret (*register_function)(void* function, gw2al_hashed_name name);
@@ -66,11 +66,11 @@ typedef struct gw2al_core_vtable {
6666
void* (*query_function)(gw2al_hashed_name name);
6767

6868
//fills table of functions using query_function
69-
void (*fill_vtable)(gw2al_hashed_name* nameList, void** vtable);
69+
void (*fill_vtable)(const gw2al_hashed_name* nameList, void** vtable);
7070

7171
//functions to unload/load addons
7272
gw2al_api_ret (*unload_addon)(gw2al_hashed_name name);
73-
gw2al_api_ret (*load_addon)(wchar_t* name);
73+
gw2al_api_ret (*load_addon)(const wchar_t* name);
7474

7575
//function to get currently loaded addon description
7676
gw2al_addon_dsc* (*query_addon)(gw2al_hashed_name name);
@@ -90,7 +90,7 @@ typedef struct gw2al_core_vtable {
9090

9191
//simple logging function
9292

93-
void (*log_text)(gw2al_log_level level, wchar_t* source, wchar_t* text);
93+
void (*log_text)(gw2al_log_level level, const wchar_t* source, const wchar_t* text);
9494

9595
} gw2al_core_vtable;
9696

loader_core/gw2al_api_addon_registry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name)
118118
return ret;
119119
}
120120

121-
gw2al_api_ret gw2al_core__load_addon(wchar_t * name)
121+
gw2al_api_ret gw2al_core__load_addon(const wchar_t * name)
122122
{
123123
LOG_DEBUG(L"core", L"Loading addon %s", name);
124124

loader_core/gw2al_api_func_registry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void * gw2al_core__query_function(gw2al_hashed_name name)
3636
return funcStorage.query_obj(name);
3737
}
3838

39-
void gw2al_core__fill_vtable(gw2al_hashed_name * nameList, void ** vtable)
39+
void gw2al_core__fill_vtable(const gw2al_hashed_name * nameList, void ** vtable)
4040
{
4141
unsigned int i = 0;
4242
while (nameList[i] != 0)

loader_core/gw2al_api_impl.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
FILE* logFile = NULL;
44
bool firstInit = true;
55

6+
static const wchar_t* lvlPrefix[] = {
7+
L"[INFO] ",
8+
L"[ERR] ",
9+
L"[WARN] ",
10+
L"[DEBUG] "
11+
};
12+
613
bool gw2al_core__init()
714
{
815
if (!firstInit)
@@ -18,7 +25,7 @@ bool gw2al_core__init()
1825
return true;
1926
}
2027

21-
gw2al_hashed_name gw2al_core__hash_name(wchar_t * name)
28+
gw2al_hashed_name gw2al_core__hash_name(const wchar_t * name)
2229
{
2330
unsigned int msz = lstrlenW(name)*2;
2431

@@ -53,7 +60,8 @@ void gw2al_core__client_unload()
5360
}
5461
}
5562

56-
void gw2al_core__log_text(gw2al_log_level level, wchar_t* source, wchar_t* text)
63+
64+
void gw2al_core__log_text(gw2al_log_level level, const wchar_t* source, const wchar_t* text)
5765
{
5866
#ifndef _DEBUG
5967
if (level > LL_WARN)
@@ -63,13 +71,6 @@ void gw2al_core__log_text(gw2al_log_level level, wchar_t* source, wchar_t* text)
6371
if (!logFile)
6472
return;
6573

66-
static const wchar_t* lvlPrefix[] = {
67-
L"[INFO] ",
68-
L"[ERR] ",
69-
L"[WARN] ",
70-
L"[DEBUG] "
71-
};
72-
7374
fwrite(lvlPrefix[level], sizeof(wchar_t), wcslen(lvlPrefix[level]), logFile);
7475
fwrite(source, sizeof(wchar_t), wcslen(source), logFile);
7576
fwrite(L" | ", sizeof(wchar_t), 3, logFile);

loader_core/gw2al_api_impl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void gw2al_core__init_addon_registry();
2929
void gw2al_core__init_events();
3030

3131
//converts string to hash for usage in other functions
32-
gw2al_hashed_name gw2al_core__hash_name(wchar_t* name);
32+
gw2al_hashed_name gw2al_core__hash_name(const wchar_t* name);
3333

3434
//register/unregister user functions to be called by other addons
3535
gw2al_api_ret gw2al_core__register_function(void* function, gw2al_hashed_name name);
@@ -39,11 +39,11 @@ void gw2al_core__unregister_function(gw2al_hashed_name name);
3939
void* gw2al_core__query_function(gw2al_hashed_name name);
4040

4141
//fills table of functions using query_function
42-
void gw2al_core__fill_vtable(gw2al_hashed_name* nameList, void** vtable);
42+
void gw2al_core__fill_vtable(const gw2al_hashed_name* nameList, void** vtable);
4343

4444
//functions to unload/load addons
4545
gw2al_api_ret gw2al_core__unload_addon(gw2al_hashed_name name);
46-
gw2al_api_ret gw2al_core__load_addon(wchar_t* name);
46+
gw2al_api_ret gw2al_core__load_addon(const wchar_t* name);
4747

4848
//function to get currently loaded addon description
4949
gw2al_addon_dsc* gw2al_core__query_addon(gw2al_hashed_name name);
@@ -59,4 +59,4 @@ unsigned int gw2al_core__trigger_event(gw2al_event_id id, void* data);
5959

6060
void gw2al_core__client_unload();
6161

62-
void gw2al_core__log_text(gw2al_log_level level, wchar_t* source, wchar_t* text);
62+
void gw2al_core__log_text(gw2al_log_level level, const wchar_t* source, const wchar_t* text);

0 commit comments

Comments
 (0)