Skip to content

Commit a42a097

Browse files
committed
Fix whitespacing (end of line space)
1 parent e7b139c commit a42a097

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

sql/winservice.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void get_file_version(const char *path, int *major, int *minor, int *patch)
4040
*major= *minor= *patch= 0;
4141

4242
size= GetFileVersionInfoSize(path, &version_handle);
43-
if (size == 0)
43+
if (size == 0)
4444
return;
4545
ver= (char *)malloc(size);
4646
if(!GetFileVersionInfo(path, version_handle, size, ver))
@@ -65,7 +65,7 @@ void normalize_path(char *path, size_t size)
6565
char *p;
6666
strcpy_s(buf, MAX_PATH, path+1);
6767
p= strchr(buf, '"');
68-
if (p)
68+
if (p)
6969
*p=0;
7070
}
7171
else
@@ -118,15 +118,15 @@ BOOL exclude_service(mysqld_service_properties *props)
118118

119119
/*
120120
Retrieve some properties from windows mysqld service binary path.
121-
We're interested in ini file location and datadir, and also in version of
121+
We're interested in ini file location and datadir, and also in version of
122122
the data. We tolerate missing mysqld.exe.
123123
124-
Note that this function carefully avoids using mysql libraries (e.g dbug),
124+
Note that this function carefully avoids using mysql libraries (e.g dbug),
125125
since it is used in unusual environments (windows installer, MFC), where we
126-
do not have much control over how threads are created and destroyed, so we
126+
do not have much control over how threads are created and destroyed, so we
127127
cannot assume MySQL thread initilization here.
128128
*/
129-
int get_mysql_service_properties(const wchar_t *bin_path,
129+
int get_mysql_service_properties(const wchar_t *bin_path,
130130
mysqld_service_properties *props)
131131
{
132132
int numargs;
@@ -174,7 +174,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
174174
if(wcsstr(mysqld_path, L".exe") == NULL)
175175
wcscat(mysqld_path, L".exe");
176176

177-
if(wcsicmp(file_part, L"mysqld.exe") != 0 &&
177+
if(wcsicmp(file_part, L"mysqld.exe") != 0 &&
178178
wcsicmp(file_part, L"mysqld-debug.exe") != 0 &&
179179
wcsicmp(file_part, L"mysqld-nt.exe") != 0 &&
180180
wcsicmp(file_part, L"mariadbd.exe") != 0)
@@ -187,7 +187,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
187187
/* If mysqld.exe exists, try to get its version from executable */
188188
if (GetFileAttributes(props->mysqld_exe) != INVALID_FILE_ATTRIBUTES)
189189
{
190-
get_file_version(props->mysqld_exe, &props->version_major,
190+
get_file_version(props->mysqld_exe, &props->version_major,
191191
&props->version_minor, &props->version_patch);
192192
}
193193

@@ -198,7 +198,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
198198
normalize_path(props->inifile, MAX_PATH);
199199
if (GetFileAttributes(props->inifile) != INVALID_FILE_ATTRIBUTES)
200200
{
201-
GetPrivateProfileString("mysqld", "datadir", NULL, props->datadir, MAX_PATH,
201+
GetPrivateProfileString("mysqld", "datadir", NULL, props->datadir, MAX_PATH,
202202
props->inifile);
203203
}
204204
else
@@ -217,7 +217,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
217217
{
218218
/*
219219
Hard, although a rare case, we're guessing datadir and defaults-file.
220-
On Windows, defaults-file is traditionally install-root\my.ini
220+
On Windows, defaults-file is traditionally install-root\my.ini
221221
and datadir is install-root\data
222222
*/
223223
char install_root[MAX_PATH];
@@ -276,7 +276,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
276276
}
277277

278278
/*
279-
If version could not be determined so far, try mysql_upgrade_info in
279+
If version could not be determined so far, try mysql_upgrade_info in
280280
database directory.
281281
*/
282282
if(props->version_major == 0)

0 commit comments

Comments
 (0)