4dd95f634c6… — Fossil SCM

M src/http_socket.c

+3 -3

		--- src/http_socket.c
		+++ src/http_socket.c
		@@ -196,17 +196,17 @@
196	196
197	197	/*
198	198	** Send content out over the open socket connection.
199	199	*/
200	200	size_t socket_send(void NotUsed, const void pContent, size_t N){
201		- size_t sent;
	201	+ ssize_t sent;
202	202	size_t total = 0;
203	203	while( N>0 ){
204	204	sent = send(iSocket, pContent, N, 0);
205	205	if( sent<=0 ) break;
206		- total += sent;
207		- N -= sent;
	206	+ total += (size_t)sent;
	207	+ N -= (size_t)sent;
208	208	pContent = (void)&((char)pContent)[sent];
209	209	}
210	210	return total;
211	211	}
212	212
213	213

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -196,17 +196,17 @@
196
197	/*
198	** Send content out over the open socket connection.
199	*/
200	size_t socket_send(void NotUsed, const void pContent, size_t N){
201	size_t sent;
202	size_t total = 0;
203	while( N>0 ){
204	sent = send(iSocket, pContent, N, 0);
205	if( sent<=0 ) break;
206	total += sent;
207	N -= sent;
208	pContent = (void)&((char)pContent)[sent];
209	}
210	return total;
211	}
212
213

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -196,17 +196,17 @@
196
197	/*
198	** Send content out over the open socket connection.
199	*/
200	size_t socket_send(void NotUsed, const void pContent, size_t N){
201	ssize_t sent;
202	size_t total = 0;
203	while( N>0 ){
204	sent = send(iSocket, pContent, N, 0);
205	if( sent<=0 ) break;
206	total += (size_t)sent;
207	N -= (size_t)sent;
208	pContent = (void)&((char)pContent)[sent];
209	}
210	return total;
211	}
212
213

M src/printf.c

+1 -1

		--- src/printf.c
		+++ src/printf.c
		@@ -1002,11 +1002,11 @@
1002	1002	if( out==0 ) return;
1003	1003	}
1004	1004	now = time(0);
1005	1005	pNow = gmtime(&now);
1006	1006	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
1007		- pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
	1007	+ pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday,
1008	1008	pNow->tm_hour, pNow->tm_min, pNow->tm_sec);
1009	1009	va_start(ap, zFormat);
1010	1010	vfprintf(out, zFormat, ap);
1011	1011	fprintf(out, "\n");
1012	1012	va_end(ap);
1013	1013

	--- src/printf.c
	+++ src/printf.c
	@@ -1002,11 +1002,11 @@
1002	if( out==0 ) return;
1003	}
1004	now = time(0);
1005	pNow = gmtime(&now);
1006	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
1007	pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday+1,
1008	pNow->tm_hour, pNow->tm_min, pNow->tm_sec);
1009	va_start(ap, zFormat);
1010	vfprintf(out, zFormat, ap);
1011	fprintf(out, "\n");
1012	va_end(ap);
1013

	--- src/printf.c
	+++ src/printf.c
	@@ -1002,11 +1002,11 @@
1002	if( out==0 ) return;
1003	}
1004	now = time(0);
1005	pNow = gmtime(&now);
1006	fprintf(out, "------------- %04d-%02d-%02d %02d:%02d:%02d UTC ------------\n",
1007	pNow->tm_year+1900, pNow->tm_mon+1, pNow->tm_mday,
1008	pNow->tm_hour, pNow->tm_min, pNow->tm_sec);
1009	va_start(ap, zFormat);
1010	vfprintf(out, zFormat, ap);
1011	fprintf(out, "\n");
1012	va_end(ap);
1013

M win/Makefile.mingw.mistachkin

-2

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -2382,11 +2382,10 @@
2382	2382	-DSQLITE_USE_ALLOCA \
2383	2383	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2384	2384	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2385	2385	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2386	2386	-DSQLITE_ENABLE_FTS4 \
2387		- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2388	2387	-DSQLITE_ENABLE_DBSTAT_VTAB \
2389	2388	-DSQLITE_ENABLE_JSON1 \
2390	2389	-DSQLITE_ENABLE_FTS5 \
2391	2390	-DSQLITE_ENABLE_STMTVTAB \
2392	2391	-DSQLITE_HAVE_ZLIB \
		@@ -2412,11 +2411,10 @@
2412	2411	-DSQLITE_USE_ALLOCA \
2413	2412	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2414	2413	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2415	2414	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2416	2415	-DSQLITE_ENABLE_FTS4 \
2417		- -DSQLITE_ENABLE_FTS3_PARENTHESIS \
2418	2416	-DSQLITE_ENABLE_DBSTAT_VTAB \
2419	2417	-DSQLITE_ENABLE_JSON1 \
2420	2418	-DSQLITE_ENABLE_FTS5 \
2421	2419	-DSQLITE_ENABLE_STMTVTAB \
2422	2420	-DSQLITE_HAVE_ZLIB \
2423	2421

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -2382,11 +2382,10 @@
2382	-DSQLITE_USE_ALLOCA \
2383	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2384	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2385	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2386	-DSQLITE_ENABLE_FTS4 \
2387	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
2388	-DSQLITE_ENABLE_DBSTAT_VTAB \
2389	-DSQLITE_ENABLE_JSON1 \
2390	-DSQLITE_ENABLE_FTS5 \
2391	-DSQLITE_ENABLE_STMTVTAB \
2392	-DSQLITE_HAVE_ZLIB \
	@@ -2412,11 +2411,10 @@
2412	-DSQLITE_USE_ALLOCA \
2413	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2414	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2415	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2416	-DSQLITE_ENABLE_FTS4 \
2417	-DSQLITE_ENABLE_FTS3_PARENTHESIS \
2418	-DSQLITE_ENABLE_DBSTAT_VTAB \
2419	-DSQLITE_ENABLE_JSON1 \
2420	-DSQLITE_ENABLE_FTS5 \
2421	-DSQLITE_ENABLE_STMTVTAB \
2422	-DSQLITE_HAVE_ZLIB \
2423

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -2382,11 +2382,10 @@
2382	-DSQLITE_USE_ALLOCA \
2383	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2384	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2385	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2386	-DSQLITE_ENABLE_FTS4 \

2387	-DSQLITE_ENABLE_DBSTAT_VTAB \
2388	-DSQLITE_ENABLE_JSON1 \
2389	-DSQLITE_ENABLE_FTS5 \
2390	-DSQLITE_ENABLE_STMTVTAB \
2391	-DSQLITE_HAVE_ZLIB \
	@@ -2412,11 +2411,10 @@
2411	-DSQLITE_USE_ALLOCA \
2412	-DSQLITE_ENABLE_LOCKING_STYLE=0 \
2413	-DSQLITE_DEFAULT_FILE_FORMAT=4 \
2414	-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
2415	-DSQLITE_ENABLE_FTS4 \

2416	-DSQLITE_ENABLE_DBSTAT_VTAB \
2417	-DSQLITE_ENABLE_JSON1 \
2418	-DSQLITE_ENABLE_FTS5 \
2419	-DSQLITE_ENABLE_STMTVTAB \
2420	-DSQLITE_HAVE_ZLIB \
2421

Fossil SCM