Ticket #5930: 0001-Whitespace-only-convert-mixed-tabs-and-spaces-to-spa.patch

File 0001-Whitespace-only-convert-mixed-tabs-and-spaces-to-spa.patch, 3.3 KB (added by elaforge, 14 months ago)

tabs to spaces

  • System/Environment.hs

    From 53966e073256866f705c7e748ab46d0b53a935bf Mon Sep 17 00:00:00 2001
    From: Evan Laforge <qdunkan@gmail.com>
    Date: Sun, 11 Mar 2012 18:23:43 -0700
    Subject: [PATCH 1/2] Whitespace only: convert mixed tabs and spaces to
     spaces.
    
    ---
     System/Environment.hs |   42 +++++++++++++++++++++---------------------
     1 files changed, 21 insertions(+), 21 deletions(-)
    
    diff --git a/System/Environment.hs b/System/Environment.hs
    index d5bc1ad..72d7eba 100644
    a b  
    7070 
    7171getWin32ProgArgv_certainly :: IO [String] 
    7272getWin32ProgArgv_certainly = do 
    73         mb_argv <- getWin32ProgArgv 
    74         case mb_argv of 
    75           Nothing   -> fmap dropRTSArgs getFullArgs 
    76           Just argv -> return argv 
     73        mb_argv <- getWin32ProgArgv 
     74        case mb_argv of 
     75          Nothing   -> fmap dropRTSArgs getFullArgs 
     76          Just argv -> return argv 
    7777 
    7878withWin32ProgArgv :: [String] -> IO a -> IO a 
    7979withWin32ProgArgv argv act = bracket begin setWin32ProgArgv (\_ -> act) 
    8080  where 
    8181    begin = do 
    82           mb_old_argv <- getWin32ProgArgv 
    83           setWin32ProgArgv (Just argv) 
    84           return mb_old_argv 
     82          mb_old_argv <- getWin32ProgArgv 
     83          setWin32ProgArgv (Just argv) 
     84          return mb_old_argv 
    8585 
    8686getWin32ProgArgv :: IO (Maybe [String]) 
    8787getWin32ProgArgv = alloca $ \p_argc -> alloca $ \p_argv -> do 
    88         c_getWin32ProgArgv p_argc p_argv 
    89         argc <- peek p_argc 
    90         argv_p <- peek p_argv 
    91         if argv_p == nullPtr 
    92         then return Nothing 
    93         else do 
    94           argv_ps <- peekArray (fromIntegral argc) argv_p 
    95           fmap Just $ mapM peekCWString argv_ps 
     88        c_getWin32ProgArgv p_argc p_argv 
     89        argc <- peek p_argc 
     90        argv_p <- peek p_argv 
     91        if argv_p == nullPtr 
     92        then return Nothing 
     93        else do 
     94          argv_ps <- peekArray (fromIntegral argc) argv_p 
     95          fmap Just $ mapM peekCWString argv_ps 
    9696 
    9797setWin32ProgArgv :: Maybe [String] -> IO () 
    9898setWin32ProgArgv Nothing = c_setWin32ProgArgv 0 nullPtr 
    9999setWin32ProgArgv (Just argv) = withMany withCWString argv $ \argv_ps -> withArrayLen argv_ps $ \argc argv_p -> do 
    100         c_setWin32ProgArgv (fromIntegral argc) argv_p 
     100        c_setWin32ProgArgv (fromIntegral argc) argv_p 
    101101 
    102102foreign import ccall unsafe "getWin32ProgArgv" 
    103103  c_getWin32ProgArgv :: Ptr CInt -> Ptr (Ptr CWString) -> IO () 
     
    196196      res <- c_GetEnvironmentVariable s p_value size 
    197197      case res of 
    198198        0 -> do 
    199                   err <- c_GetLastError 
    200                   if err == eRROR_ENVVAR_NOT_FOUND 
    201                    then ioe_missingEnvVar name 
    202                    else throwGetLastError "getEnv" 
     199                  err <- c_GetLastError 
     200                  if err == eRROR_ENVVAR_NOT_FOUND 
     201                   then ioe_missingEnvVar name 
     202                   else throwGetLastError "getEnv" 
    203203        _ | res > size -> try_size s res -- Rare: size increased between calls to GetEnvironmentVariable 
    204204          | otherwise  -> peekCWString p_value 
    205205 
     
    225225 
    226226ioe_missingEnvVar :: String -> IO a 
    227227ioe_missingEnvVar name = ioException (IOError Nothing NoSuchThing "getEnv" 
    228                                                                                           "no environment variable" Nothing (Just name)) 
     228    "no environment variable" Nothing (Just name)) 
    229229 
    230230{-| 
    231231'withArgs' @args act@ - while executing action @act@, have 'getArgs'