[Libreoffice-commits] core.git: tools/source

Chris Sherlock chris.sherlock79 at gmail.com
Sat Aug 23 23:19:53 PDT 2014


 tools/source/misc/extendapplicationenvironment.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 10d14a94d104504f0bb43688857296aed7b80b7f
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Aug 24 16:14:45 2014 +1000

    tools: make some variable names more clear
    
    Change-Id: I5eb2428f4c71e5aa9bfc0bf71c06d87be039ad3b

diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx
index 1271659..f125388 100644
--- a/tools/source/misc/extendapplicationenvironment.cxx
+++ b/tools/source/misc/extendapplicationenvironment.cxx
@@ -46,10 +46,10 @@ namespace tools {
 void extendApplicationEnvironment() {
 #if defined UNX
     // Try to set RLIMIT_NOFILE as large as possible (failure is harmless):
-    rlimit l;
-    if (getrlimit(RLIMIT_NOFILE, &l) == 0) {
-        l.rlim_cur = l.rlim_max;
-        setrlimit(RLIMIT_NOFILE, &l);
+    rlimit lim;
+    if (getrlimit(RLIMIT_NOFILE, &lim) == 0) {
+        lim.rlim_cur = lim.rlim_max;
+        setrlimit(RLIMIT_NOFILE, &lim);
     }
 #endif
 
@@ -68,9 +68,9 @@ void extendApplicationEnvironment() {
         if (osl_getExecutableFile(&uri.pData) != osl_Process_E_None) {
             abort();
         }
-        sal_Int32 i = uri.lastIndexOf('/');
-        if (i >= 0) {
-            uri = uri.copy(0, i + 1);
+        sal_Int32 lastDirSeperatorPos = uri.lastIndexOf('/');
+        if (lastDirSeperatorPos >= 0) {
+            uri = uri.copy(0, lastDirSeperatorPos + 1);
         }
         env.append(rtl::Bootstrap::encode(uri));
 #if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE


More information about the Libreoffice-commits mailing list