aboutsummaryrefslogtreecommitdiffhomepage
path: root/expand.cpp
diff options
context:
space:
mode:
authorGravatar Peter Ammon <corydoras@ridiculousfish.com>2012-01-14 03:41:50 -0800
committerGravatar Peter Ammon <corydoras@ridiculousfish.com>2012-01-14 03:41:50 -0800
commitf3e2d2f68f14120e298fb1d50be89fa5e83c9222 (patch)
tree96ef9489858ca97b2c305e2e7e3267bce36f1687 /expand.cpp
parenta359f45df219e6a3845870ca69b4116083d787f7 (diff)
Lots of warnings fixes and const correctness
Diffstat (limited to 'expand.cpp')
-rw-r--r--expand.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/expand.cpp b/expand.cpp
index f909bde4..cf0030c3 100644
--- a/expand.cpp
+++ b/expand.cpp
@@ -380,7 +380,6 @@ static int find_process( const wchar_t *proc,
array_list_t *out )
{
DIR *dir;
- struct wdirent *next;
wchar_t *pdir_name;
wchar_t *pfile_name;
wchar_t *cmd=0;
@@ -1775,7 +1774,6 @@ int expand_string2( const wcstring &input, std::vector<wcstring> &output, int fl
size_t i;
int cmdsubst_ok = 1;
int res = EXPAND_OK;
- int start_count = output.size();
if( (!(flags & ACCEPT_INCOMPLETE)) && expand_is_clean( input.c_str() ) )
{
@@ -2179,7 +2177,7 @@ int expand_string( void *context,
if( ((flags & ACCEPT_INCOMPLETE) && (!(flags & EXPAND_SKIP_WILDCARDS))) ||
wildcard_has( next, 1 ) )
{
- wchar_t *start, *rest;
+ const wchar_t *start, *rest;
array_list_t *list = out;
if( next[0] == '/' )