Mercurial > public > mercurial-scm > hg
diff mercurial/osutil.c @ 10282:08a0f04b56bd
many, many trivial check-code fixups
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 25 Jan 2010 00:05:27 -0600 |
| parents | 3ac42ca1f3e6 |
| children | 4eaacccbb2ca |
line wrap: on
line diff
--- a/mercurial/osutil.c Mon Jan 25 00:05:22 2010 -0600 +++ b/mercurial/osutil.c Mon Jan 25 00:05:27 2010 -0600 @@ -14,13 +14,13 @@ #include <string.h> #ifdef _WIN32 -# include <windows.h> -# include <io.h> +#include <windows.h> +#include <io.h> #else -# include <dirent.h> -# include <sys/stat.h> -# include <sys/types.h> -# include <unistd.h> +#include <dirent.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> #endif /* some platforms lack the PATH_MAX definition (eg. GNU/Hurd) */ @@ -174,7 +174,7 @@ stp->st_mtime = to_python_time(&fd->ftLastWriteTime); stp->st_ctime = to_python_time(&fd->ftCreationTime); if (kind == _S_IFREG) - stp->st_size = ((__int64)fd->nFileSizeHigh << 32) + stp->st_size = ((__int64)fd->nFileSizeHigh << 32) + fd->nFileSizeLow; return Py_BuildValue("siN", fd->cFileName, kind, py_st); @@ -189,7 +189,7 @@ char *pattern; /* build the path + \* pattern string */ - pattern = malloc(plen+3); /* path + \* + \0 */ + pattern = malloc(plen + 3); /* path + \* + \0 */ if (!pattern) { PyErr_NoMemory(); goto error_nomem; @@ -485,7 +485,7 @@ goto bail; } - fd = _open_osfhandle((intptr_t) handle, flags); + fd = _open_osfhandle((intptr_t)handle, flags); if (fd == -1) { CloseHandle(handle); PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);