aboutsummaryrefslogtreecommitdiffstats
path: root/libfsobasics
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2011-02-24 18:51:01 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2011-02-24 18:51:01 +0100
commit81b227e550ad358dc8aa8d36ddaab4fd82a8696f (patch)
treedde794449d8bf6d85495fbf598798dd01db7a8ab /libfsobasics
parent8e66f7e5cecfb4bd6b655645770a2b87e12cd607 (diff)
downloadcornucopia-81b227e550ad358dc8aa8d36ddaab4fd82a8696f.tar.gz
cornucopia-81b227e550ad358dc8aa8d36ddaab4fd82a8696f.tar.bz2
cornucopia-81b227e550ad358dc8aa8d36ddaab4fd82a8696f.zip
libfsobasics: warnings--
Diffstat (limited to 'libfsobasics')
-rw-r--r--libfsobasics/fsobasics/binary.vala32
-rw-r--r--libfsobasics/fsobasics/libinitexit.vala4
-rw-r--r--libfsobasics/fsobasics/logger.vala1
-rw-r--r--libfsobasics/fsobasics/process.vala31
4 files changed, 39 insertions, 29 deletions
diff --git a/libfsobasics/fsobasics/binary.vala b/libfsobasics/fsobasics/binary.vala
index 9852d375..f321710e 100644
--- a/libfsobasics/fsobasics/binary.vala
+++ b/libfsobasics/fsobasics/binary.vala
@@ -1,8 +1,4 @@
-/*
- * File Name:
- * Creation Date:
- * Last Modified:
- *
+/*
* Authored by Frederik 'playya' Sdun <Frederik.Sdun@googlemail.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -30,9 +26,9 @@ namespace FsoFramework {
*/
public class BinBuilder: Object
{
- public static uint8 nth_byte(uint64 val, uint byte)
+ public static uint8 nth_byte(uint64 val, uint byte)
{
- if( byte > sizeof(uint64) )
+ if( byte > sizeof(uint64) )
{
critical(@"byte value out of range: $byte");
return 0;
@@ -73,7 +69,7 @@ public class BinBuilder: Object
this.alignment_byte = alignment_byte;
}
- construct
+ construct
{
_data = new List<uint8>();
}
@@ -128,7 +124,7 @@ public class BinBuilder: Object
append_align();
}
- public void append_int16(int16 v)
+ public void append_int16(int16 v)
{
var uv = uint16_convert((uint16)v);
@@ -199,28 +195,28 @@ public class BinBuilder: Object
append_align();
}
- public void append_pad(long length, uint8 byte)
+ public void append_pad(long length, uint8 byte)
{
if(length > 0)
{
_data.reverse();
- for(int i = 0; i < length; i++)
+ for(int i = 0; i < length; i++)
_data.prepend( byte );
_data.reverse();
}
}
- public void append_align()
+ public void append_align()
{
if(alignment == 0)
return;
var align_bytes = alignment - (_data.length() % alignment);
- if(align_bytes != alignment)
+ if(align_bytes != alignment)
{
- for(int i = 0; i < align_bytes; i++)
+ for(int i = 0; i < align_bytes; i++)
{
_data.append( alignment_byte );
}
@@ -306,7 +302,7 @@ public class BinBuilder: Object
l.data = e;
l = l.next;
}
- for(int i = (int)s.length; i < pad_to; i ++)
+ for(int i = (int)s.length; i < pad_to; i ++)
{
l.data = padding;
l = l.next;
@@ -396,7 +392,7 @@ public class BinBuilder: Object
insert_uint16(Checksum.crc16(data[start:end]), pos);
}
- public void reset()
+ public void reset()
{
_data = new List<uint8>();
}
@@ -431,7 +427,7 @@ public class BinBuilder: Object
return val;
}
- protected unowned List<uint8> get_at(int position, uint assure_nth = 1)
+ protected unowned List<uint8> get_at(int position, uint assure_nth = 1)
{
if(position < 0)
position += (int)_data.length();
@@ -567,7 +563,7 @@ public class BinReader : Object
public uint64 get_bits(int position, int offset, int length) throws BinReaderError
{
uint64 result = 0;
- int byte_offset = offset / 8;
+ //int byte_offset = offset / 8;
if(length > 64)
throw new BinReaderError.ILLEGAL_PARAMETER(@"length[$length] is > 64");
diff --git a/libfsobasics/fsobasics/libinitexit.vala b/libfsobasics/fsobasics/libinitexit.vala
index 65951aef..8b874df4 100644
--- a/libfsobasics/fsobasics/libinitexit.vala
+++ b/libfsobasics/fsobasics/libinitexit.vala
@@ -52,10 +52,10 @@ static void vala_library_init()
if ( FsoFramework.theConfig.boolValue( "logging", "log_backtrace", true) )
{
- int i = 0;
+ var i = 0;
foreach( var sig in FsoFramework.theConfig.stringListValue( "logging", "log_bt_signals", { "2", "15" } ) )
{
- Posix.signal( sig.to_int(), FsoFramework.onSignal );
+ Posix.signal( int.parse( sig ), FsoFramework.onSignal );
i++;
}
diff --git a/libfsobasics/fsobasics/logger.vala b/libfsobasics/fsobasics/logger.vala
index b0728a05..ff53b944 100644
--- a/libfsobasics/fsobasics/logger.vala
+++ b/libfsobasics/fsobasics/logger.vala
@@ -533,7 +533,6 @@ public class GLibLogger : Object
break;
default:
assert_not_reached();
- break;
}
}
}
diff --git a/libfsobasics/fsobasics/process.vala b/libfsobasics/fsobasics/process.vala
index 65e46b63..37233fbc 100644
--- a/libfsobasics/fsobasics/process.vala
+++ b/libfsobasics/fsobasics/process.vala
@@ -46,13 +46,13 @@ namespace FsoFramework.Process
{
int result = 0;
int pid = 0;
- string statfile, pstat, comm, pname;
+ string statfile, pstat, pname;
string[] stat_info;
string[] subdirs = listDirectory( PROC_PATH );
foreach ( var dirname in subdirs )
{
- pid = dirname.to_int();
+ pid = int.parse( dirname );
// check for invalid pid and ignore them
if ( pid <= 0 )
@@ -427,6 +427,7 @@ public class FsoFramework.GProcessGuard : FsoFramework.IProcessGuard, GLib.Objec
public class AsyncProcess : GLib.Object
{
static const int NUM_FRIENDLY_KILLS = 5;
+
~AsyncProcess()
{
Source.remove( child );
@@ -465,7 +466,7 @@ public class AsyncProcess : GLib.Object
{
get
{
- if( _cmd_line == null )
+ if ( _cmd_line == null )
_cmd_line = "\"" + string.joinv( """" """", argv ) + "\"";
return _cmd_line;
}
@@ -486,7 +487,7 @@ public class AsyncProcess : GLib.Object
public async int launch( Cancellable? cancel = null, string[] argv ) throws GLib.SpawnError
{
- if( cancel != null && cancel.is_cancelled() )
+ if ( cancel != null && cancel.is_cancelled() )
return -1;
this.argv = argv;
@@ -500,17 +501,31 @@ public class AsyncProcess : GLib.Object
out _std_in,
out std_out,
out std_err );
- if( stdout_watch != null )
+ if ( stdout_watch != null )
{
out_channel = new IOChannel.unix_new( std_out );
- out_channel.set_flags( stdout_flags );
+ try
+ {
+ out_channel.set_flags( stdout_flags );
+ }
+ catch ( IOChannelError e1 )
+ {
+ warning( @"Could not set flags for stdout: $(e1.message)" );
+ }
out_channel.add_watch( stdout_condition, stdout_watch );
}
- if( stderr_watch != null )
+ if ( stderr_watch != null )
{
err_channel = new IOChannel.unix_new( std_out );
- err_channel.set_flags( stdout_flags );
+ try
+ {
+ err_channel.set_flags( stdout_flags );
+ }
+ catch ( IOChannelError e2 )
+ {
+ warning( @"Could not set flags for stderr: $(e2.message)" );
+ }
err_channel.add_watch( stdout_condition, stdout_watch );
}