aboutsummaryrefslogtreecommitdiffhomepage
path: root/highlight.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-07-28 17:49:46 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-08-04 11:34:45 -0700
commit2e1b3325c63cd6c43a10a08acfc54d1fb29a5c03 (patch)
treebf02e8d37f7ea5ffe28d293ad7bd3b690cc7dae6 /highlight.cpp
parent1b8f1650dc9959ace0df2037f751682e73b5bb1d (diff)
Warning cleanup
Diffstat (limited to 'highlight.cpp')
-rw-r--r--highlight.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/highlight.cpp b/highlight.cpp
index a58b1664..3cf05435 100644
--- a/highlight.cpp
+++ b/highlight.cpp
@@ -309,15 +309,14 @@ static bool is_potential_cd_path(const wcstring &path, const wcstring &working_d
rgb_color_t highlight_get_color( int highlight, bool is_background )
{
- size_t i;
- int idx=0;
+ size_t idx=0;
rgb_color_t result;
if( highlight < 0 )
return rgb_color_t::normal();
if( highlight > (1<<VAR_COUNT) )
return rgb_color_t::normal();
- for( i=0; i<VAR_COUNT; i++ )
+ for( size_t i=0; i<VAR_COUNT; i++ )
{
if( highlight & (1<<i ))
{
@@ -456,7 +455,7 @@ static void highlight_param( const wcstring &buffstr, std::vector<int> &colors,
for( i=0; i<chars; i++ )
{
- int d = convert_digit( buff[++in_pos],base);
+ long d = convert_digit( buff[++in_pos],base);
if( d < 0 )
{