Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-05 06:04:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-05 06:04:26 +0400
commit4acab3eb33db20eef89d0159199429c690b0f2df (patch)
treee3a8f567c4f065d5a34b486b5e6a9b8c049c4d56 /source/blender/python/generic/py_capi_utils.c
parent5c395b69f55560e20c4c1f3e972b8e0759c647c2 (diff)
Code Cleanup: line length and use Py_ssize_t for PyC_AsArray utility function.
Diffstat (limited to 'source/blender/python/generic/py_capi_utils.c')
-rw-r--r--source/blender/python/generic/py_capi_utils.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 43b8dc21300..ebc9a61f604 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -35,18 +35,20 @@
#include "py_capi_utils.h"
-#include "BLI_string_utf8.h" /* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
+/* only for BLI_strncpy_wchar_from_utf8, should replace with py funcs but too late in release now */
+#include "BLI_string_utf8.h"
#ifdef _WIN32 /* BLI_setenv */
#include "BLI_path_util.h"
#endif
/* array utility function */
-int PyC_AsArray(void *array, PyObject *value, const int length, const PyTypeObject *type, const short is_double, const char *error_prefix)
+int PyC_AsArray(void *array, PyObject *value, const Py_ssize_t length,
+ const PyTypeObject *type, const short is_double, const char *error_prefix)
{
PyObject *value_fast;
- int value_len;
- int i;
+ Py_ssize_t value_len;
+ Py_ssize_t i;
if (!(value_fast=PySequence_Fast(value, error_prefix))) {
return -1;
@@ -463,7 +465,8 @@ void PyC_SetHomePath(const char *py_path_bundle)
if (py_path_bundle==NULL) {
/* Common enough to have bundled *nix python but complain on OSX/Win */
#if defined(__APPLE__) || defined(_WIN32)
- fprintf(stderr, "Warning! bundled python not found and is expected on this platform. (if you built with CMake: 'install' target may have not been built)\n");
+ fprintf(stderr, "Warning! bundled python not found and is expected on this platform. "
+ "(if you built with CMake: 'install' target may have not been built)\n");
#endif
return;
}
@@ -492,7 +495,8 @@ void PyC_SetHomePath(const char *py_path_bundle)
/* cant use this, on linux gives bug: #23018, TODO: try LANG="en_US.UTF-8" /usr/bin/blender, suggested 22008 */
/* mbstowcs(py_path_bundle_wchar, py_path_bundle, FILE_MAXDIR); */
- BLI_strncpy_wchar_from_utf8(py_path_bundle_wchar, py_path_bundle, sizeof(py_path_bundle_wchar) / sizeof(wchar_t));
+ BLI_strncpy_wchar_from_utf8(py_path_bundle_wchar, py_path_bundle,
+ sizeof(py_path_bundle_wchar) / sizeof(wchar_t));
Py_SetPythonHome(py_path_bundle_wchar);
// printf("found python (wchar_t) '%ls'\n", py_path_bundle_wchar);