diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/curl/http.c | 2 | ||||
| -rw-r--r-- | src/rpc.c | 5 | ||||
| -rw-r--r-- | src/util/file/file_linux.c | 2 | ||||
| -rw-r--r-- | src/util/packet.h | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/curl/http.c b/src/curl/http.c index ef42c35..5674a18 100644 --- a/src/curl/http.c +++ b/src/curl/http.c @@ -44,7 +44,7 @@ static void http_handle_events(struct aki_curl *curl) http->callback(http->userdata, AKI_HTTP_ERROR, NULL, http->response_code); return; } - aki_curl_set_url(curl, al_str_c(redirect_url)); + aki_curl_set_url(curl, al_str_cr(redirect_url)); http->response_code = -1; http->content_length = -1; if (!aki_curl_add_handle(curl)) return; @@ -131,15 +131,12 @@ void aki_rpc_free(struct aki_rpc *rpc) al_array_free(rpc->commands); } -#define get_packet_id(p) \ - *((u32 *)aki_buffer_get_ptr(&p->buffer, AKI_PACKET_HEADER_LENGTH + sizeof(s8))) - void aki_rpc_connection_command(struct aki_rpc_connection *conn, struct aki_packet *packet, void (*callback)(void *, struct aki_packet *), void *userdata) { if (callback) { al_array_push(conn->callbacks, ((struct aki_rpc_callback){ - .id = get_packet_id(packet), + .id = AKI_PACKET_GET_ID(packet), .callback = callback, .userdata = userdata })); diff --git a/src/util/file/file_linux.c b/src/util/file/file_linux.c index f916e0b..403d685 100644 --- a/src/util/file/file_linux.c +++ b/src/util/file/file_linux.c @@ -214,7 +214,7 @@ bool aki_dir_read(struct aki_dir *dir, struct aki_dir_entry *entry) entry->type = AKI_ENTRY_OTHER; break; } - al_str_clone(&entry->name, al_str_c(entry->entry->d_name)); + al_str_clone(&entry->name, al_str_cr(entry->entry->d_name)); al_str_clone(&entry->path, &dir->path); al_str_cat(&entry->path, al_str_c("/")); al_str_cat(&entry->path, &entry->name); diff --git a/src/util/packet.h b/src/util/packet.h index c6b4235..f877c72 100644 --- a/src/util/packet.h +++ b/src/util/packet.h @@ -16,6 +16,9 @@ struct aki_packet { void *userdata; }; +#define AKI_PACKET_GET_ID(p) \ + *((u32 *)aki_buffer_get_ptr(&p->buffer, AKI_PACKET_HEADER_LENGTH + sizeof(s8))) + #define AKI_PACKET_WRITE_TYPE(p, type, v) \ aki_buffer_write(&(p)->buffer, &(v), (p)->windex, sizeof(type)); \ (p)->windex += (u32)sizeof(type) @@ -48,6 +51,7 @@ void aki_packet_write_u32(struct aki_packet *packet, u32 v); void aki_packet_write_s64(struct aki_packet *packet, s64 v); void aki_packet_write_u64(struct aki_packet *packet, u64 v); void aki_packet_write_f32(struct aki_packet *packet, f32 v); +void aki_packet_write_f64(struct aki_packet *packet, f64 v); void aki_packet_write_str(struct aki_packet *packet, str *s); void aki_packet_write_wstr(struct aki_packet *packet, wstr *w); void aki_packet_write_buffer(struct aki_packet *packet, struct aki_buffer *buf); @@ -61,6 +65,7 @@ u32 aki_packet_read_u32(struct aki_packet *packet); s64 aki_packet_read_s64(struct aki_packet *packet); u64 aki_packet_read_u64(struct aki_packet *packet); f32 aki_packet_read_f32(struct aki_packet *packet); +f64 aki_packet_read_f64(struct aki_packet *packet); void aki_packet_read_str(struct aki_packet *packet, str *s); void aki_packet_read_wstr(struct aki_packet *packet, wstr *w); void aki_packet_read_buffer(struct aki_packet *packet, struct aki_buffer *buf); |