aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libjin/3rdparty/tekcos/tekcos.c12
-rw-r--r--src/libjin/Audio/Source.cpp2
-rw-r--r--src/libjin/Common/Subsystem.hpp6
-rw-r--r--src/libjin/Graphics/Drawable.h4
-rw-r--r--src/libjin/Graphics/JSL.h4
-rw-r--r--src/libjin/Utils/Log.h2
-rw-r--r--src/libjin/Utils/log.h2
-rw-r--r--src/libjin/audio/source.cpp2
-rw-r--r--src/libjin/utils/log.h2
9 files changed, 20 insertions, 16 deletions
diff --git a/src/libjin/3rdparty/tekcos/tekcos.c b/src/libjin/3rdparty/tekcos/tekcos.c
index 0eed75b..e2b7e5c 100644
--- a/src/libjin/3rdparty/tekcos/tekcos.c
+++ b/src/libjin/3rdparty/tekcos/tekcos.c
@@ -168,15 +168,17 @@ error:
int tk_tcp_send(tk_TCPsocket* client, const void* buffer, int size, int* sent)
{
const char *data = (const char*)buffer;
+ int left;
+ int len;
if (client->type != SOCKET_TCLIENT)
{
state = TK_WRONGSOCKETTPYE;
goto error;
}
- int left = size;
+ left = size;
if(sent)
*sent = 0;
- int len = 0;
+ len = 0;
do {
len = send(client->id, data, left, 0);
if (len > 0) {
@@ -194,12 +196,13 @@ error:
int tk_tcp_recv(tk_TCPsocket* client, char* buffer, int size, int* len)
{
*len = 0;
+ int l;
if (client->type != SOCKET_TCLIENT)
{
state = TK_WRONGSOCKETTPYE;
goto error;
}
- int l = 0;
+ l = 0;
do
{
l = recv(client->id, buffer, size - *len, 0);
@@ -221,6 +224,7 @@ tk_TCPsocket tk_tcp_accept(tk_TCPsocket* server)
// client socket
tk_TCPsocket csk;
memset(&csk, 0, sizeof(csk));
+ int addr_len;
if (server->type != SOCKET_TSERVER)
{
state = TK_WRONGSOCKETTPYE;
@@ -228,7 +232,7 @@ tk_TCPsocket tk_tcp_accept(tk_TCPsocket* server)
}
struct sockaddr_in addr;
memset(&addr, 0, sizeof(addr));
- int addr_len = sizeof(addr);
+ addr_len = sizeof(addr);
csk.id = accept(server->id, (struct sockaddr *)&addr, &addr_len);
if (csk.id == INVALID_SOCKET)
{
diff --git a/src/libjin/Audio/Source.cpp b/src/libjin/Audio/Source.cpp
index ceb882d..61f4055 100644
--- a/src/libjin/Audio/Source.cpp
+++ b/src/libjin/Audio/Source.cpp
@@ -9,7 +9,7 @@ namespace jin
namespace audio
{
- static int check_header(const void *data, int size, char *str, int offset) {
+ static int check_header(const void *data, int size, const char *str, int offset) {
int len = strlen(str);
return (size >= offset + len) && !memcmp((char*)data + offset, str, len);
}
diff --git a/src/libjin/Common/Subsystem.hpp b/src/libjin/Common/Subsystem.hpp
index c3af3dc..1374ad1 100644
--- a/src/libjin/Common/Subsystem.hpp
+++ b/src/libjin/Common/Subsystem.hpp
@@ -23,7 +23,7 @@ namespace jin
void quit()
{
CALLONCE(quitSystem());
- destroy();
+ Singleton<System>::destroy();
}
protected:
@@ -33,8 +33,8 @@ namespace jin
SINGLETON(System);
- virtual onlyonce bool initSystem(const Setting* setting) = 0;
- virtual onlyonce void quitSystem() = 0;
+ /*onlyonce*/ virtual bool initSystem(const Setting* setting) = 0;
+ /*onlyonce*/ virtual void quitSystem() = 0;
};
diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h
index 0b96379..e04ac6b 100644
--- a/src/libjin/Graphics/Drawable.h
+++ b/src/libjin/Graphics/Drawable.h
@@ -19,12 +19,12 @@ namespace graphics
void draw(int x, int y, float sx, float sy, float r);
- inline int Drawable::getWidth() const
+ inline int getWidth() const
{
return width;
}
- inline int Drawable::getHeight() const
+ inline int getHeight() const
{
return height;
}
diff --git a/src/libjin/Graphics/JSL.h b/src/libjin/Graphics/JSL.h
index df942fd..8d4712b 100644
--- a/src/libjin/Graphics/JSL.h
+++ b/src/libjin/Graphics/JSL.h
@@ -24,13 +24,13 @@ namespace graphics
virtual ~JSLProgram();
- inline void JSLProgram::use()
+ inline void use()
{
glUseProgram(pid);
currentJSLProgram = this;
}
- static inline void JSLProgram::unuse()
+ static inline void unuse()
{
glUseProgram(0);
currentJSLProgram = nullptr;
diff --git a/src/libjin/Utils/Log.h b/src/libjin/Utils/Log.h
index 50ec3c8..e4ed879 100644
--- a/src/libjin/Utils/Log.h
+++ b/src/libjin/Utils/Log.h
@@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...)
if (!hasbit(levels, _level))
return;
#define FORMAT_MSG_BUFFER_SIZE (204800)
- char* levelStr = nullptr;
+ const char* levelStr = nullptr;
switch (_level)
{
case LV_ERROR:
diff --git a/src/libjin/Utils/log.h b/src/libjin/Utils/log.h
index 50ec3c8..e4ed879 100644
--- a/src/libjin/Utils/log.h
+++ b/src/libjin/Utils/log.h
@@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...)
if (!hasbit(levels, _level))
return;
#define FORMAT_MSG_BUFFER_SIZE (204800)
- char* levelStr = nullptr;
+ const char* levelStr = nullptr;
switch (_level)
{
case LV_ERROR:
diff --git a/src/libjin/audio/source.cpp b/src/libjin/audio/source.cpp
index ceb882d..61f4055 100644
--- a/src/libjin/audio/source.cpp
+++ b/src/libjin/audio/source.cpp
@@ -9,7 +9,7 @@ namespace jin
namespace audio
{
- static int check_header(const void *data, int size, char *str, int offset) {
+ static int check_header(const void *data, int size, const char *str, int offset) {
int len = strlen(str);
return (size >= offset + len) && !memcmp((char*)data + offset, str, len);
}
diff --git a/src/libjin/utils/log.h b/src/libjin/utils/log.h
index 50ec3c8..e4ed879 100644
--- a/src/libjin/utils/log.h
+++ b/src/libjin/utils/log.h
@@ -61,7 +61,7 @@ void Loghelper::log(Level _level, const char* _fmt, ...)
if (!hasbit(levels, _level))
return;
#define FORMAT_MSG_BUFFER_SIZE (204800)
- char* levelStr = nullptr;
+ const char* levelStr = nullptr;
switch (_level)
{
case LV_ERROR:
generated by cgit v1.1-26-g67d0 at 2025-05-21 13:04:15 +0000