mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-08 16:11:18 +00:00
Fix #2612 - struct mg_str::ptr -> buf
This commit is contained in:
1 parent
e93d18d200
commit
e0e599ffa1
61 files changed
+684
-686
No files matched your search
@@ -15,14 +15,14 @@ static void signal_handler(int sig_num) {
|
||||
bool web_load_settings(void *buf, size_t len) {
|
||||
bool ok = false;
|
||||
struct mg_str data = mg_file_read(&mg_fs_posix, CONFIG_FILE);
|
||||
if (data.ptr == NULL) {
|
||||
if (data.buf == NULL) {
|
||||
MG_ERROR(("Error reading %s", CONFIG_FILE));
|
||||
} else if (data.len != len) {
|
||||
MG_ERROR(("%s size != %lu", CONFIG_FILE, len));
|
||||
} else {
|
||||
memcpy(buf, data.ptr, len);
|
||||
memcpy(buf, data.buf, len);
|
||||
}
|
||||
free((void *) data.ptr);
|
||||
free((void *) data.buf);
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ static struct mg_connection *start_modbus_request(struct mg_mgr *mgr,
|
||||
uint16_t reg = (uint16_t) mg_json_get_long(json, "$.reg", 1);
|
||||
uint8_t func = (uint8_t) mg_json_get_long(json, "$.func", 0);
|
||||
uint16_t nregs = (uint16_t) mg_json_get_long(json, "$.nregs", 1);
|
||||
MG_INFO(("%lu REQUEST: %.*s", cid, json.len, json.ptr));
|
||||
MG_INFO(("%lu REQUEST: %.*s", cid, json.len, json.buf));
|
||||
if (func == 0) {
|
||||
MG_ERROR(("Set func to a valid modbus function code"));
|
||||
} else if ((c = mg_connect(mgr, url, mfn, NULL)) == NULL) {
|
||||
@@ -275,8 +275,8 @@ static void fn(struct mg_connection *c, int ev, void *ev_data) {
|
||||
#endif
|
||||
mg_http_serve_dir(c, ev_data, &opts);
|
||||
}
|
||||
MG_DEBUG(("%lu %.*s %.*s", c->id, (int) hm->method.len, hm->method.ptr,
|
||||
(int) hm->uri.len, hm->uri.ptr));
|
||||
MG_DEBUG(("%lu %.*s %.*s", c->id, (int) hm->method.len, hm->method.buf,
|
||||
(int) hm->uri.len, hm->uri.buf));
|
||||
} else if (ev == MG_EV_POLL) {
|
||||
if (cd->expiration_time > 0 && cd->expiration_time < mg_millis()) {
|
||||
cd->expiration_time = 0;
|
||||
|
||||
Reference in new issue
Block a user