Fossil SCM

unused variable includeDotFiles <p>struct utimbuf -> struct _utimbuf (compiler warning with mingw-w64) <p>a few "const" additions

jan.nijtmans 2012-10-15 05:28 use-utf8-in-win-external-editor

Commit d2e1469d1228db64bebf48d16ac15cc6ebb52a2a

Parent 69a0db2dd029978…

3 files changed +2 -8 +1 -1 +1 -1

M src/add.c

+2 -8

		--- src/add.c
		+++ src/add.c
		@@ -21,16 +21,10 @@
21	21	#include "config.h"
22	22	#include "add.h"
23	23	#include <assert.h>
24	24	#include <dirent.h>
25	25
26		-/*
27		-** Set to true if files whose names begin with "." should be
28		-** included when processing a recursive "add" command.
29		-*/
30		-static int includeDotFiles = 0;
31		-
32	26	/*
33	27	** This routine returns the names of files in a working checkout that
34	28	** are created by Fossil itself, and hence should not be added, deleted,
35	29	** or merge, and should be omitted from "clean" and "extra" lists.
36	30	**
		@@ -39,11 +33,11 @@
39	33	*/
40	34	const char *fossil_reserved_name(int N){
41	35	/* Possible names of the local per-checkout database file and
42	36	** its associated journals
43	37	*/
44		- static const char *azName[] = {
	38	+ static const char *const azName[] = {
45	39	"_FOSSIL_",
46	40	"_FOSSIL_-journal",
47	41	"_FOSSIL_-wal",
48	42	"_FOSSIL_-shm",
49	43	".fslckout",
		@@ -61,11 +55,11 @@
61	55	};
62	56
63	57	/* Names of auxiliary files generated by SQLite when the "manifest"
64	58	** properity is enabled
65	59	*/
66		- static const char *azManifest[] = {
	60	+ static const char *const azManifest[] = {
67	61	"manifest",
68	62	"manifest.uuid",
69	63	};
70	64
71	65	/* Cached setting "manifest" */
72	66

	--- src/add.c
	+++ src/add.c
	@@ -21,16 +21,10 @@
21	#include "config.h"
22	#include "add.h"
23	#include <assert.h>
24	#include <dirent.h>
25
26	/*
27	** Set to true if files whose names begin with "." should be
28	** included when processing a recursive "add" command.
29	*/
30	static int includeDotFiles = 0;
31
32	/*
33	** This routine returns the names of files in a working checkout that
34	** are created by Fossil itself, and hence should not be added, deleted,
35	** or merge, and should be omitted from "clean" and "extra" lists.
36	**
	@@ -39,11 +33,11 @@
39	*/
40	const char *fossil_reserved_name(int N){
41	/* Possible names of the local per-checkout database file and
42	** its associated journals
43	*/
44	static const char *azName[] = {
45	"_FOSSIL_",
46	"_FOSSIL_-journal",
47	"_FOSSIL_-wal",
48	"_FOSSIL_-shm",
49	".fslckout",
	@@ -61,11 +55,11 @@
61	};
62
63	/* Names of auxiliary files generated by SQLite when the "manifest"
64	** properity is enabled
65	*/
66	static const char *azManifest[] = {
67	"manifest",
68	"manifest.uuid",
69	};
70
71	/* Cached setting "manifest" */
72

	--- src/add.c
	+++ src/add.c
	@@ -21,16 +21,10 @@
21	#include "config.h"
22	#include "add.h"
23	#include <assert.h>
24	#include <dirent.h>
25






26	/*
27	** This routine returns the names of files in a working checkout that
28	** are created by Fossil itself, and hence should not be added, deleted,
29	** or merge, and should be omitted from "clean" and "extra" lists.
30	**
	@@ -39,11 +33,11 @@
33	*/
34	const char *fossil_reserved_name(int N){
35	/* Possible names of the local per-checkout database file and
36	** its associated journals
37	*/
38	static const char *const azName[] = {
39	"_FOSSIL_",
40	"_FOSSIL_-journal",
41	"_FOSSIL_-wal",
42	"_FOSSIL_-shm",
43	".fslckout",
	@@ -61,11 +55,11 @@
55	};
56
57	/* Names of auxiliary files generated by SQLite when the "manifest"
58	** properity is enabled
59	*/
60	static const char *const azManifest[] = {
61	"manifest",
62	"manifest.uuid",
63	};
64
65	/* Cached setting "manifest" */
66

M src/file.c

+1 -1

		--- src/file.c
		+++ src/file.c
		@@ -402,11 +402,11 @@
402	402	memset(tv, 0, sizeof(tv[0])*2);
403	403	tv[0].tv_sec = newMTime;
404	404	tv[1].tv_sec = newMTime;
405	405	utimes(zFilename, tv);
406	406	#else
407		- struct utimbuf tb;
	407	+ struct _utimbuf tb;
408	408	wchar_t *zMbcs = fossil_utf8_to_unicode(zFilename);
409	409	tb.actime = newMTime;
410	410	tb.modtime = newMTime;
411	411	_wutime(zMbcs, &tb);
412	412	fossil_mbcs_free(zMbcs);
413	413

	--- src/file.c
	+++ src/file.c
	@@ -402,11 +402,11 @@
402	memset(tv, 0, sizeof(tv[0])*2);
403	tv[0].tv_sec = newMTime;
404	tv[1].tv_sec = newMTime;
405	utimes(zFilename, tv);
406	#else
407	struct utimbuf tb;
408	wchar_t *zMbcs = fossil_utf8_to_unicode(zFilename);
409	tb.actime = newMTime;
410	tb.modtime = newMTime;
411	_wutime(zMbcs, &tb);
412	fossil_mbcs_free(zMbcs);
413

	--- src/file.c
	+++ src/file.c
	@@ -402,11 +402,11 @@
402	memset(tv, 0, sizeof(tv[0])*2);
403	tv[0].tv_sec = newMTime;
404	tv[1].tv_sec = newMTime;
405	utimes(zFilename, tv);
406	#else
407	struct _utimbuf tb;
408	wchar_t *zMbcs = fossil_utf8_to_unicode(zFilename);
409	tb.actime = newMTime;
410	tb.modtime = newMTime;
411	_wutime(zMbcs, &tb);
412	fossil_mbcs_free(zMbcs);
413

M src/vfile.c

+1 -1

		--- src/vfile.c
		+++ src/vfile.c
		@@ -385,11 +385,11 @@
385	385
386	386	/*
387	387	** Return TRUE if zFile is a temporary file. Return FALSE if not.
388	388	*/
389	389	static int is_temporary_file(const char *zName){
390		- static const char *azTemp[] = {
	390	+ static const char *const azTemp[] = {
391	391	"baseline",
392	392	"merge",
393	393	"original",
394	394	"output",
395	395	};
396	396

	--- src/vfile.c
	+++ src/vfile.c
	@@ -385,11 +385,11 @@
385
386	/*
387	** Return TRUE if zFile is a temporary file. Return FALSE if not.
388	*/
389	static int is_temporary_file(const char *zName){
390	static const char *azTemp[] = {
391	"baseline",
392	"merge",
393	"original",
394	"output",
395	};
396

	--- src/vfile.c
	+++ src/vfile.c
	@@ -385,11 +385,11 @@
385
386	/*
387	** Return TRUE if zFile is a temporary file. Return FALSE if not.
388	*/
389	static int is_temporary_file(const char *zName){
390	static const char *const azTemp[] = {
391	"baseline",
392	"merge",
393	"original",
394	"output",
395	};
396