mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #13772: Mark helper functions as private (static) 

Cleanup also the code to follow the Python coding style (PEP 7).
This commit is contained in:
Victor Stinner 2013-06-05 01:49:17 +02:00
parent e87267dc6e
commit 31b3b92f7a
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Modules/posixmodule.c
View File

@ -6720,8 +6720,9 @@ dir_fd may not be implemented on your platform.\n\
/* Grab CreateSymbolicLinkW dynamically from kernel32 */ /* Grab CreateSymbolicLinkW dynamically from kernel32 */
static DWORD (CALLBACK *Py_CreateSymbolicLinkW)(LPWSTR, LPWSTR, DWORD) = NULL; static DWORD (CALLBACK *Py_CreateSymbolicLinkW)(LPWSTR, LPWSTR, DWORD) = NULL;
static DWORD (CALLBACK *Py_CreateSymbolicLinkA)(LPSTR, LPSTR, DWORD) = NULL; static DWORD (CALLBACK *Py_CreateSymbolicLinkA)(LPSTR, LPSTR, DWORD) = NULL;
static int static int
check_CreateSymbolicLink() check_CreateSymbolicLink(void)
{ {
HINSTANCE hKernel32; HINSTANCE hKernel32;
/* only recheck */ /* only recheck */
@ -6735,55 +6736,57 @@ check_CreateSymbolicLink()
return (Py_CreateSymbolicLinkW && Py_CreateSymbolicLinkA); return (Py_CreateSymbolicLinkW && Py_CreateSymbolicLinkA);
} }
void _dirnameW(WCHAR *path) { /* Remove the last portion of the path */
/* Remove the last portion of the path */ static void
_dirnameW(WCHAR *path)
{
WCHAR *ptr; WCHAR *ptr;
/* walk the path from the end until a backslash is encountered */ /* walk the path from the end until a backslash is encountered */
for(ptr = path + wcslen(path); ptr != path; ptr--) for(ptr = path + wcslen(path); ptr != path; ptr--) {
{ if (*ptr == *L"\\" || *ptr == *L"/")
if(*ptr == *L"\\" || *ptr == *L"/") {
break; break;
} }
}
*ptr = 0; *ptr = 0;
} }
void _dirnameA(char *path) { /* Remove the last portion of the path */
/* Remove the last portion of the path */ static void
_dirnameA(char *path)
{
char *ptr; char *ptr;
/* walk the path from the end until a backslash is encountered */ /* walk the path from the end until a backslash is encountered */
for(ptr = path + strlen(path); ptr != path; ptr--) for(ptr = path + strlen(path); ptr != path; ptr--) {
{ if (*ptr == '\\' || *ptr == '/')
if(*ptr == '\\' || *ptr == '/') {
break; break;
} }
}
*ptr = 0; *ptr = 0;
} }
int _is_absW(const WCHAR *path) { /* Is this path absolute? */
/* Is this path absolute? */ static int
_is_absW(const WCHAR *path)
{
return path[0] == L'\\' || path[0] == L'/' || path[1] == L':'; return path[0] == L'\\' || path[0] == L'/' || path[1] == L':';
} }
int _is_absA(const char *path) { /* Is this path absolute? */
/* Is this path absolute? */ static int
_is_absA(const char *path)
{
return path[0] == '\\' || path[0] == '/' || path[1] == ':'; return path[0] == '\\' || path[0] == '/' || path[1] == ':';
} }
void _joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest) { /* join root and rest with a backslash */
/* join root and rest with a backslash */ static void
_joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest)
{
size_t root_len; size_t root_len;
if(_is_absW(rest)) { if (_is_absW(rest)) {
wcscpy(dest_path, rest); wcscpy(dest_path, rest);
return; return;
} }
@ -6792,17 +6795,19 @@ void _joinW(WCHAR *dest_path, const WCHAR *root, const WCHAR *rest) {
wcscpy(dest_path, root); wcscpy(dest_path, root);
if(root_len) { if(root_len) {
dest_path[root_len] = *L"\\"; dest_path[root_len] = L'\\';
root_len += 1; root_len++;
} }
wcscpy(dest_path+root_len, rest); wcscpy(dest_path+root_len, rest);
} }
void _joinA(char *dest_path, const char *root, const char *rest) { /* join root and rest with a backslash */
/* join root and rest with a backslash */ static void
_joinA(char *dest_path, const char *root, const char *rest)
{
size_t root_len; size_t root_len;
if(_is_absA(rest)) { if (_is_absA(rest)) {
strcpy(dest_path, rest); strcpy(dest_path, rest);
return; return;
} }
@ -6812,14 +6817,15 @@ void _joinA(char *dest_path, const char *root, const char *rest) {
strcpy(dest_path, root); strcpy(dest_path, root);
if(root_len) { if(root_len) {
dest_path[root_len] = '\\'; dest_path[root_len] = '\\';
root_len += 1; root_len++;
} }
strcpy(dest_path+root_len, rest); strcpy(dest_path+root_len, rest);
} }
int _check_dirW(WCHAR *src, WCHAR *dest) /* Return True if the path at src relative to dest is a directory */
static int
_check_dirW(WCHAR *src, WCHAR *dest)
{ {
/* Return True if the path at src relative to dest is a directory */
WIN32_FILE_ATTRIBUTE_DATA src_info; WIN32_FILE_ATTRIBUTE_DATA src_info;
WCHAR dest_parent[MAX_PATH]; WCHAR dest_parent[MAX_PATH];
WCHAR src_resolved[MAX_PATH] = L""; WCHAR src_resolved[MAX_PATH] = L"";
@ -6835,9 +6841,10 @@ int _check_dirW(WCHAR *src, WCHAR *dest)
); );
} }
int _check_dirA(char *src, char *dest) /* Return True if the path at src relative to dest is a directory */
static int
_check_dirA(char *src, char *dest)
{ {
/* Return True if the path at src relative to dest is a directory */
WIN32_FILE_ATTRIBUTE_DATA src_info; WIN32_FILE_ATTRIBUTE_DATA src_info;
char dest_parent[MAX_PATH]; char dest_parent[MAX_PATH];
char src_resolved[MAX_PATH] = ""; char src_resolved[MAX_PATH] = "";