Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
diff --git a/RISCOS/Modules/getpath_riscos.c b/RISCOS/Modules/getpath_riscos.c
index ce978c6..11e92c1 100644
--- a/RISCOS/Modules/getpath_riscos.c
+++ b/RISCOS/Modules/getpath_riscos.c
@@ -5,24 +5,24 @@
static void
calculate_path()
-{
- char *pypath = getenv("Python$Path");
- if (pypath) {
- int pathlen = strlen(pypath);
- module_search_path = malloc(pathlen + 1);
- if (module_search_path)
- strncpy(module_search_path, pypath, pathlen + 1);
- else {
- fprintf(stderr,
- "Not enough memory for dynamic PYTHONPATH.\n"
- "Using default static PYTHONPATH.\n");
- }
- }
- if (!module_search_path)
- module_search_path = "<Python$Dir>.Lib";
- prefix = "<Python$Dir>";
- exec_prefix = prefix;
- progpath = Py_GetProgramName();
+{
+ char *pypath = getenv("Python$Path");
+ if (pypath) {
+ int pathlen = strlen(pypath);
+ module_search_path = malloc(pathlen + 1);
+ if (module_search_path)
+ strncpy(module_search_path, pypath, pathlen + 1);
+ else {
+ fprintf(stderr,
+ "Not enough memory for dynamic PYTHONPATH.\n"
+ "Using default static PYTHONPATH.\n");
+ }
+ }
+ if (!module_search_path)
+ module_search_path = "<Python$Dir>.Lib";
+ prefix = "<Python$Dir>";
+ exec_prefix = prefix;
+ progpath = Py_GetProgramName();
}
/* External interface */
@@ -30,31 +30,31 @@
char *
Py_GetPath()
{
- if (!module_search_path)
- calculate_path();
- return module_search_path;
+ if (!module_search_path)
+ calculate_path();
+ return module_search_path;
}
char *
Py_GetPrefix()
{
- if (!module_search_path)
- calculate_path();
- return prefix;
+ if (!module_search_path)
+ calculate_path();
+ return prefix;
}
char *
Py_GetExecPrefix()
{
- if (!module_search_path)
- calculate_path();
- return exec_prefix;
+ if (!module_search_path)
+ calculate_path();
+ return exec_prefix;
}
char *
Py_GetProgramFullPath()
{
- if (!module_search_path)
- calculate_path();
- return progpath;
+ if (!module_search_path)
+ calculate_path();
+ return progpath;
}