Changeset 5413:c4775e53e3a0 in roaraudio

Timestamp:

02/14/12 21:11:31 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixes cppcheck warnings (false-positives)

Files:

• libroar/vio_misc.c (modified) (1 diff)
• libroar/vio_proto.c (modified) (1 diff)
• roarclients/.release-helper (modified) (1 diff)
• roarclients/Makefile (modified) (1 diff)
• roard/driver_pwmled.c (modified) (3 diffs)

libroar/vio_misc.c

@@ -65 +65 @@
 
 static int     roar_vio_misc_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
- struct roar_vio_misc * self = vio->inst;
+ struct roar_vio_misc * self;
 
  if ( vio == NULL || cmd == -1 )
   return -1;
+
+ self = vio->inst;
 
  switch (cmd) {

libroar/vio_proto.c

@@ -254 +254 @@
 
 int     roar_vio_proto_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
- struct roar_vio_proto * self = vio->inst;
+ struct roar_vio_proto * self;
 
  if (vio == NULL || cmd == -1)
   return -1;
+
+ self = vio->inst;
 
  ROAR_DBG("roar_vio_proto_ctl(vio=%p, cmd=0x%.8x, data=%p) = ?", vio, cmd, data);

roarclients/.release-helper

@@ -3 +3 @@
 @RM roarcat2sock.c
 @RM roarcatad.c
+@RM roarfctest.c
+@RM pinentrytest.c
 #!END

roarclients/Makefile

@@ -9 +9 @@
 TARGETS_PLUGINS=roarpluginrunner
 
-#TARGETS_TESTS=pinentrytest zcattest pgptest pipetest polytest roarfctest
+#TARGETS_TESTS=zcattest pgptest pipetest polytest
 #TARGETS_OLD=roarcatpassfh roarsocktypes
 

roard/driver_pwmled.c

@@ -98 +98 @@
 // TODO: this function should be optimized.
 ssize_t driver_pwmled_write (struct roar_vio_calls * vio,  void *buf, size_t count) {
- struct driver_pwmled * self = vio->inst;
+ struct driver_pwmled * self;
  int value;
 
@@ -106 +106 @@
  if ( count != 512 )
   return -1;
+
+ self = vio->inst;
 
  value = ((unsigned char*)buf)[self->channel] / 15;
@@ -123 +125 @@
 
 int driver_pwmled_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
- struct driver_pwmled * self = vio->inst;
+ struct driver_pwmled * self;
 
  if ( vio == NULL )
   return -1;
+
+ self = vio->inst;
 
  switch (cmd) {