diff options
| author | 2023-10-14 10:04:40 +0200 | |
|---|---|---|
| committer | 2023-10-14 10:04:40 +0200 | |
| commit | fbb773ae7288394273d7b27f7bdb47487485232d (patch) | |
| tree | 82ba5bb9cf5e113b25771b012db3c79c23fd4a89 | |
| parent | Fixed bug that crashed Tusky. (diff) | |
| download | snac2-fbb773ae7288394273d7b27f7bdb47487485232d.tar.gz snac2-fbb773ae7288394273d7b27f7bdb47487485232d.tar.xz snac2-fbb773ae7288394273d7b27f7bdb47487485232d.zip | |
Backport from xs.
| -rw-r--r-- | httpd.c | 2 | ||||
| -rw-r--r-- | xs.h | 4 | ||||
| -rw-r--r-- | xs_version.h | 2 |
3 files changed, 4 insertions, 4 deletions
| @@ -448,7 +448,7 @@ static void *job_thread(void *arg) | |||
| 448 | /* it's a socket */ | 448 | /* it's a socket */ |
| 449 | FILE *f = NULL; | 449 | FILE *f = NULL; |
| 450 | 450 | ||
| 451 | xs_data_get(job, &f); | 451 | xs_data_get(&f, job); |
| 452 | 452 | ||
| 453 | if (f != NULL) | 453 | if (f != NULL) |
| 454 | httpd_connection(f); | 454 | httpd_connection(f); |
| @@ -115,7 +115,7 @@ const char *xs_number_str(const xs_number *v); | |||
| 115 | 115 | ||
| 116 | xs_data *xs_data_new(const void *data, int size); | 116 | xs_data *xs_data_new(const void *data, int size); |
| 117 | int xs_data_size(const xs_data *value); | 117 | int xs_data_size(const xs_data *value); |
| 118 | void xs_data_get(const xs_data *value, void *data); | 118 | void xs_data_get(void *data, const xs_data *value); |
| 119 | 119 | ||
| 120 | void *xs_memmem(const char *haystack, int h_size, const char *needle, int n_size); | 120 | void *xs_memmem(const char *haystack, int h_size, const char *needle, int n_size); |
| 121 | 121 | ||
| @@ -1153,7 +1153,7 @@ int xs_data_size(const xs_data *value) | |||
| 1153 | } | 1153 | } |
| 1154 | 1154 | ||
| 1155 | 1155 | ||
| 1156 | void xs_data_get(const xs_data *value, void *data) | 1156 | void xs_data_get(void *data, const xs_data *value) |
| 1157 | /* copies the raw data stored inside value into data */ | 1157 | /* copies the raw data stored inside value into data */ |
| 1158 | { | 1158 | { |
| 1159 | memcpy(data, &value[4], xs_data_size(value)); | 1159 | memcpy(data, &value[4], xs_data_size(value)); |
diff --git a/xs_version.h b/xs_version.h index f5836c7..a30fb2d 100644 --- a/xs_version.h +++ b/xs_version.h | |||
| @@ -1 +1 @@ | |||
| /* 0b8d1591403ac07d83de975db6afa27e353f958c */ | /* a9cd3893c427bbcc478c5680245d435e415fd58a */ | ||