Fix warnings and sync line numbers of unamalgamated sources

mongoose.h

@@ -510,7 +510,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_esp32.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_ESP32_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_ESP32_H_
 #if CS_PLATFORM == CS_P_ESP32
@@ -551,7 +550,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_esp8266.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_ESP8266_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_ESP8266_H_
 #if CS_PLATFORM == CS_P_ESP8266
@@ -608,7 +606,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_cc3100.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_CC3100_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_CC3100_H_
 #if CS_PLATFORM == CS_P_CC3100
@@ -653,7 +650,6 @@ int inet_pton(int af, const char *src, void *dst);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_cc3200.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_CC3200_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_CC3200_H_
 #if CS_PLATFORM == CS_P_CC3200
@@ -774,7 +770,6 @@ int stat(const char *pathname, struct stat *st);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_cc3220.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_CC3220_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_CC3220_H_
 #if CS_PLATFORM == CS_P_CC3220
@@ -882,7 +877,6 @@ int stat(const char *pathname, struct stat *st);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_msp432.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_MSP432_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_MSP432_H_
 #if CS_PLATFORM == CS_P_MSP432
@@ -986,7 +980,6 @@ int _stat(const char *pathname, struct stat *st);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_tm4c129.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_TM4C129_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_TM4C129_H_
 #if CS_PLATFORM == CS_P_TM4C129
@@ -1042,7 +1035,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_mbed.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_MBED_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_MBED_H_
 #if CS_PLATFORM == CS_P_MBED
@@ -1207,7 +1199,6 @@ int gettimeofday(struct timeval *tp, void *tzp);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/simplelink/cs_simplelink.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_SIMPLELINK_CS_SIMPLELINK_H_
 #define CS_COMMON_PLATFORMS_SIMPLELINK_CS_SIMPLELINK_H_
 
@@ -1574,7 +1565,6 @@ const char *strerror();
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_nxp_lpc.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_NXP_LPC_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_NXP_LPC_H_
 
@@ -1626,7 +1616,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_nxp_kinetis.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_NXP_KINETIS_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_NXP_KINETIS_H_
 
@@ -1656,7 +1645,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_pic32.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_PIC32_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_PIC32_H_
 
@@ -1692,7 +1680,6 @@ char *inet_ntoa(struct in_addr in);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_rs14100.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_RS14100_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_RS14100_H_
 #if CS_PLATFORM == CS_P_RS14100
@@ -1740,7 +1727,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/platform_stm32.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_PLATFORM_STM32_H_
 #define CS_COMMON_PLATFORMS_PLATFORM_STM32_H_
 #if CS_PLATFORM == CS_P_STM32
@@ -1778,7 +1764,6 @@ typedef struct stat cs_stat_t;
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/platforms/lwip/mg_lwip.h"
 #endif
-
 #ifndef CS_COMMON_PLATFORMS_LWIP_MG_LWIP_H_
 #define CS_COMMON_PLATFORMS_LWIP_MG_LWIP_H_
 
@@ -1845,7 +1830,6 @@ void mg_lwip_set_keepalive_params(struct mg_connection *nc, int idle,
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/cs_md5.h"
 #endif
-
 #ifndef CS_COMMON_MD5_H_
 #define CS_COMMON_MD5_H_
 
@@ -1877,7 +1861,6 @@ void cs_md5_final(unsigned char *md, cs_md5_ctx *c);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/cs_sha1.h"
 #endif
-
 #ifndef CS_COMMON_SHA1_H_
 #define CS_COMMON_SHA1_H_
 
@@ -1915,7 +1898,6 @@ void cs_hmac_sha1(const unsigned char *key, size_t key_len,
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/cs_time.h"
 #endif
-
 #ifndef CS_COMMON_CS_TIME_H_
 #define CS_COMMON_CS_TIME_H_
 
@@ -1944,7 +1926,6 @@ double cs_timegm(const struct tm *tm);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/mg_str.h"
 #endif
-
 #ifndef CS_COMMON_MG_STR_H_
 #define CS_COMMON_MG_STR_H_
 
@@ -2044,7 +2025,6 @@ int mg_str_starts_with(struct mg_str s, struct mg_str prefix);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/mbuf.h"
 #endif
-
 /*
  * Mbufs are mutable/growing memory buffers, like C++ strings.
  * Mbuf can append data to the end of a buffer or insert data into arbitrary
@@ -2142,7 +2122,6 @@ void mbuf_trim(struct mbuf *);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/cs_base64.h"
 #endif
-
 #ifndef CS_COMMON_CS_BASE64_H_
 #define CS_COMMON_CS_BASE64_H_
 
@@ -2195,7 +2174,6 @@ int cs_base64_decode(const unsigned char *s, int len, char *dst, int *dec_len);
 #ifdef MG_MODULE_LINES
 #line 1 "src/common/str_util.h"
 #endif
-
 #ifndef CS_COMMON_STR_UTIL_H_
 #define CS_COMMON_STR_UTIL_H_
 
@@ -3135,7 +3113,6 @@ struct {								\
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_features.h"
 #endif
-
 #ifndef CS_MONGOOSE_SRC_FEATURES_H_
 #define CS_MONGOOSE_SRC_FEATURES_H_
 
@@ -3310,7 +3287,6 @@ struct {								\
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_net_if.h"
 #endif
-
 #ifndef CS_MONGOOSE_SRC_NET_IF_H_
 #define CS_MONGOOSE_SRC_NET_IF_H_
 
@@ -3440,7 +3416,6 @@ double mg_mgr_min_timer(const struct mg_mgr *mgr);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_ssl_if.h"
 #endif
-
 #ifndef CS_MONGOOSE_SRC_SSL_IF_H_
 #define CS_MONGOOSE_SRC_SSL_IF_H_
 
@@ -3494,7 +3469,6 @@ int mg_ssl_if_write(struct mg_connection *nc, const void *data, size_t len);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_net.h"
 #endif
-
 /*
  * === Core API: TCP/UDP/SSL
  *
@@ -4080,7 +4054,6 @@ double mg_time(void);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_uri.h"
 #endif
-
 /*
  * === URI
  */
@@ -4146,7 +4119,6 @@ int mg_normalize_uri_path(const struct mg_str *in, struct mg_str *out);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_util.h"
 #endif
-
 /*
  * === Utility API
  */
@@ -4360,7 +4332,6 @@ struct mg_str mg_url_encode(const struct mg_str src);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_http.h"
 #endif
-
 /*
  * === Common API reference
  */
@@ -5373,7 +5344,6 @@ int mg_http_create_digest_auth_header(char *buf, size_t buf_len,
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_mqtt.h"
 #endif
-
 /*
  * === MQTT API reference
  */
@@ -5588,7 +5558,6 @@ int mg_mqtt_vmatch_topic_expression(const char *exp, struct mg_str topic);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_mqtt_server.h"
 #endif
-
 /*
  * === MQTT Server API reference
  */
@@ -5679,7 +5648,6 @@ struct mg_mqtt_session *mg_mqtt_next(struct mg_mqtt_broker *brk,
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_dns.h"
 #endif
-
 /*
  * === DNS API reference
  */
@@ -5843,7 +5811,6 @@ void mg_set_protocol_dns(struct mg_connection *nc);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_dns_server.h"
 #endif
-
 /*
  * === DNS server API reference
  *
@@ -5936,7 +5903,6 @@ void mg_dns_send_reply(struct mg_connection *nc, struct mg_dns_reply *r);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_resolv.h"
 #endif
-
 /*
  * === API reference
  */
@@ -6016,7 +5982,6 @@ int mg_resolve_from_hosts_file(const char *host, union socket_address *usa);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_coap.h"
 #endif
-
 /*
  * === CoAP API reference
  *
@@ -6168,7 +6133,6 @@ uint32_t mg_coap_compose(struct mg_coap_message *cm, struct mbuf *io);
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_sntp.h"
 #endif
-
 #ifndef CS_MONGOOSE_SRC_SNTP_H_
 #define CS_MONGOOSE_SRC_SNTP_H_
 
@@ -6221,7 +6185,6 @@ struct mg_connection *mg_sntp_get_time(struct mg_mgr *mgr,
 #ifdef MG_MODULE_LINES
 #line 1 "src/mg_socks.h"
 #endif
-
 #ifndef CS_MONGOOSE_SRC_SOCKS_H_
 #define CS_MONGOOSE_SRC_SOCKS_H_