Formatting: indent the OS specific blocks.

JuliaLang · Aug 14, 2016 · 319cae5 · 319cae5
1 parent bb7272e
commit 319cae5
Showing 1 changed file with 74 additions and 78 deletions.
diff --git a/base/env.jl b/base/env.jl
@@ -1,61 +1,59 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
 if is_windows()
-const ERROR_ENVVAR_NOT_FOUND = UInt32(203)
+ const ERROR_ENVVAR_NOT_FOUND = UInt32(203)
 
-_getenvlen(var::Vector{UInt16}) = ccall(:GetEnvironmentVariableW,stdcall,UInt32,(Ptr{UInt16},Ptr{UInt16},UInt32),var,C_NULL,0)
-_hasenv(s::Vector{UInt16}) = _getenvlen(s) != 0 || Libc.GetLastError() != ERROR_ENVVAR_NOT_FOUND
-_hasenv(s::AbstractString) = _hasenv(cwstring(s))
+ _getenvlen(var::Vector{UInt16}) = ccall(:GetEnvironmentVariableW,stdcall,UInt32,(Ptr{UInt16},Ptr{UInt16},UInt32),var,C_NULL,0)
+ _hasenv(s::Vector{UInt16}) = _getenvlen(s) != 0 || Libc.GetLastError() != ERROR_ENVVAR_NOT_FOUND
+ _hasenv(s::AbstractString) = _hasenv(cwstring(s))
 
-function access_env(onError::Function, str::AbstractString)
- var = cwstring(str)
- len = _getenvlen(var)
- if len == 0
- return Libc.GetLastError() != ERROR_ENVVAR_NOT_FOUND ? "" : onError(str)
+ function access_env(onError::Function, str::AbstractString)
+ var = cwstring(str)
+ len = _getenvlen(var)
+ if len == 0
+ return Libc.GetLastError() != ERROR_ENVVAR_NOT_FOUND ? "" : onError(str)
+ end
+ val = zeros(UInt16,len)
+ ret = ccall(:GetEnvironmentVariableW,stdcall,UInt32,(Ptr{UInt16},Ptr{UInt16},UInt32),var,val,len)
+ if (ret == 0 && len != 1) || ret != len-1 || val[end] != 0
+ error(string("getenv: ", str, ' ', len, "-1 != ", ret, ": ", Libc.FormatMessage()))
+ end
+ pop!(val) # NUL
+ return transcode(String, val)
  end
- val = zeros(UInt16,len)
- ret = ccall(:GetEnvironmentVariableW,stdcall,UInt32,(Ptr{UInt16},Ptr{UInt16},UInt32),var,val,len)
- if (ret == 0 && len != 1) || ret != len-1 || val[end] != 0
- error(string("getenv: ", str, ' ', len, "-1 != ", ret, ": ", Libc.FormatMessage()))
+
+ function _setenv(svar::AbstractString, sval::AbstractString, overwrite::Bool=true)
+ var = cwstring(svar)
+ val = cwstring(sval)
+ if overwrite || !_hasenv(var)
+ ret = ccall(:SetEnvironmentVariableW,stdcall,Int32,(Ptr{UInt16},Ptr{UInt16}),var,val)
+ systemerror(:setenv, ret == 0)
+ end
  end
- pop!(val) # NUL
- return transcode(String, val)
-end
 
-function _setenv(svar::AbstractString, sval::AbstractString, overwrite::Bool=true)
- var = cwstring(svar)
- val = cwstring(sval)
- if overwrite || !_hasenv(var)
- ret = ccall(:SetEnvironmentVariableW,stdcall,Int32,(Ptr{UInt16},Ptr{UInt16}),var,val)
+ function _unsetenv(svar::AbstractString)
+ var = cwstring(svar)
+ ret = ccall(:SetEnvironmentVariableW,stdcall,Int32,(Ptr{UInt16},Ptr{UInt16}),var,C_NULL)
  systemerror(:setenv, ret == 0)
  end
-end
-
-function _unsetenv(svar::AbstractString)
- var = cwstring(svar)
- ret = ccall(:SetEnvironmentVariableW,stdcall,Int32,(Ptr{UInt16},Ptr{UInt16}),var,C_NULL)
- systemerror(:setenv, ret == 0)
-end
-
 else # !windows
-_getenv(var::AbstractString) = ccall(:getenv, Cstring, (Cstring,), var)
-_hasenv(s::AbstractString) = _getenv(s) != C_NULL
-
-function access_env(onError::Function, var::AbstractString)
- val = _getenv(var)
- val == C_NULL ? onError(var) : unsafe_string(val)
-end
+ _getenv(var::AbstractString) = ccall(:getenv, Cstring, (Cstring,), var)
+ _hasenv(s::AbstractString) = _getenv(s) != C_NULL
 
-function _setenv(var::AbstractString, val::AbstractString, overwrite::Bool=true)
- ret = ccall(:setenv, Int32, (Cstring,Cstring,Int32), var, val, overwrite)
- systemerror(:setenv, ret != 0)
-end
+ function access_env(onError::Function, var::AbstractString)
+  val = _getenv(var)
+  val == C_NULL ? onError(var) : unsafe_string(val)
+ end
 
-function _unsetenv(var::AbstractString)
- ret = ccall(:unsetenv, Int32, (Cstring,), var)
- systemerror(:unsetenv, ret != 0)
-end
+ function _setenv(var::AbstractString, val::AbstractString, overwrite::Bool=true)
+  ret = ccall(:setenv, Int32, (Cstring,Cstring,Int32), var, val, overwrite)
+  systemerror(:setenv, ret != 0)
+ end
 
+ function _unsetenv(var::AbstractString)
+ ret = ccall(:unsetenv, Int32, (Cstring,), var)
+ systemerror(:unsetenv, ret != 0)
+ end
 end # os test
 
 ## ENV: hash interface ##
@@ -82,45 +80,43 @@ setindex!(::EnvHash, v, k::AbstractString) = _setenv(k,string(v))
 push!(::EnvHash, k::AbstractString, v) = setindex!(ENV, v, k)
 
 if is_windows()
-start(hash::EnvHash) = (pos = ccall(:GetEnvironmentStringsW,stdcall,Ptr{UInt16},()); (pos,pos))
-function done(hash::EnvHash, block::Tuple{Ptr{UInt16},Ptr{UInt16}})
- if unsafe_load(block[1]) == 0
- ccall(:FreeEnvironmentStringsW, stdcall, Int32, (Ptr{UInt16},), block[2])
- return true
+ start(hash::EnvHash) = (pos = ccall(:GetEnvironmentStringsW,stdcall,Ptr{UInt16},()); (pos,pos))
+ function done(hash::EnvHash, block::Tuple{Ptr{UInt16},Ptr{UInt16}})
+ if unsafe_load(block[1]) == 0
+ ccall(:FreeEnvironmentStringsW, stdcall, Int32, (Ptr{UInt16},), block[2])
+ return true
+ end
+ return false
  end
- return false
-end
-function next(hash::EnvHash, block::Tuple{Ptr{UInt16},Ptr{UInt16}})
- pos = block[1]
- blk = block[2]
- len = ccall(:wcslen, UInt, (Ptr{UInt16},), pos) + 1
- buf = Array{UInt16}(len)
- unsafe_copy!(pointer(buf), pos, len)
- env = transcode(String, buf)
- m = match(r"^(=?[^=]+)=(.*)$"s, env)
- if m === nothing
- error("malformed environment entry: $env")
+ function next(hash::EnvHash, block::Tuple{Ptr{UInt16},Ptr{UInt16}})
+ pos = block[1]
+ blk = block[2]
+  len = ccall(:wcslen, UInt, (Ptr{UInt16},), pos) + 1
+  buf = Array{UInt16}(len)
+  unsafe_copy!(pointer(buf), pos, len)
+  env = transcode(String, buf)
+  m = match(r"^(=?[^=]+)=(.*)$"s, env)
+  if m === nothing
+  error("malformed environment entry: $env")
+  end
+ return (Pair{String,String}(m.captures[1], m.captures[2]), (pos+len*2, blk))
  end
- return (Pair{String,String}(m.captures[1], m.captures[2]), (pos+len*2, blk))
-end
-
 else # !windows
-start(::EnvHash) = 0
-done(::EnvHash, i) = (ccall(:jl_environ, Any, (Int32,), i) === nothing)
+ start(::EnvHash) = 0
+ done(::EnvHash, i) = (ccall(:jl_environ, Any, (Int32,), i) === nothing)
 
-function next(::EnvHash, i)
- env = ccall(:jl_environ, Any, (Int32,), i)
- if env === nothing
- throw(BoundsError())
- end
- env = env::String
- m = match(r"^(.*?)=(.*)$"s, env)
- if m === nothing
- error("malformed environment entry: $env")
+ function next(::EnvHash, i)
+ env = ccall(:jl_environ, Any, (Int32,), i)
+ if env === nothing
+ throw(BoundsError())
+ end
+ env = env::String
+ m = match(r"^(.*?)=(.*)$"s, env)
+ if m === nothing
+ error("malformed environment entry: $env")
+ end
+ return (Pair{String,String}(m.captures[1], m.captures[2]), i+1)
  end
- return (Pair{String,String}(m.captures[1], m.captures[2]), i+1)
-end
-
 end # os-test
 
 #TODO: Make these more efficent