mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/compat-cleanup'

Browse Source 
Code cleanup.

* dl/compat-cleanup:
  compat/*.[ch]: remove extern from function declarations using spatch
  mingw: apply array.cocci rule
This commit is contained in:
Junio C Hamano
2019-09-30 13:19:23 +09:00
parent 59438be06c 7027f508c7
commit 00bb74453d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/mingw.c
View File

@ -1265,7 +1265,7 @@ static wchar_t *make_environment_block(char **deltaenv)
} }
ALLOC_ARRAY(result, size); ALLOC_ARRAY(result, size);
memcpy(result, wenv, size * sizeof(*wenv)); COPY_ARRAY(result, wenv, size);
FreeEnvironmentStringsW(wenv); FreeEnvironmentStringsW(wenv);
return result; return result;
} }
@ -1309,7 +1309,7 @@ static wchar_t *make_environment_block(char **deltaenv)
continue; continue;
size = wcslen(array[i]) + 1; size = wcslen(array[i]) + 1;
memcpy(p, array[i], size * sizeof(*p)); COPY_ARRAY(p, array[i], size);
p += size; p += size;
} }
*p = L'\0'; *p = L'\0';

6
compat/mingw.h
View File

@ -11,7 +11,7 @@ typedef _sigset_t sigset_t;
#undef _POSIX_THREAD_SAFE_FUNCTIONS #undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif #endif
extern int mingw_core_config(const char *var, const char *value, void *cb); int mingw_core_config(const char *var, const char *value, void *cb);
#define platform_core_config mingw_core_config #define platform_core_config mingw_core_config
/* /*
@ -443,7 +443,7 @@ static inline void convert_slashes(char *path)
*path = '/'; *path = '/';
} }
#define PATH_SEP ';' #define PATH_SEP ';'
extern char *mingw_query_user_email(void); char *mingw_query_user_email(void);
#define query_user_email mingw_query_user_email #define query_user_email mingw_query_user_email
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800) #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
#define PRIuMAX "I64u" #define PRIuMAX "I64u"
@ -580,4 +580,4 @@ int main(int argc, const char **argv);
/* /*
* Used by Pthread API implementation for Windows * Used by Pthread API implementation for Windows
*/ */
extern int err_win_to_posix(DWORD winerr); int err_win_to_posix(DWORD winerr);

6
compat/win32/pthread.h
View File

@ -50,7 +50,7 @@ typedef struct {
DWORD tid; DWORD tid;
} pthread_t; } pthread_t;
extern int pthread_create(pthread_t *thread, const void *unused, int pthread_create(pthread_t *thread, const void *unused,
void *(*start_routine)(void*), void *arg); void *(*start_routine)(void*), void *arg);
/* /*
@ -59,10 +59,10 @@ extern int pthread_create(pthread_t *thread, const void *unused,
*/ */
#define pthread_join(a, b) win32_pthread_join(&(a), (b)) #define pthread_join(a, b) win32_pthread_join(&(a), (b))
extern int win32_pthread_join(pthread_t *thread, void **value_ptr); int win32_pthread_join(pthread_t *thread, void **value_ptr);
#define pthread_equal(t1, t2) ((t1).tid == (t2).tid) #define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
extern pthread_t pthread_self(void); pthread_t pthread_self(void);
static inline void NORETURN pthread_exit(void *ret) static inline void NORETURN pthread_exit(void *ret)
{ {