Fixed compilation warnings and errors

There were some warnings and errors in in Dario's code. This is a simple
fix of them.

diff --git a/fres/resalloc/fra_generic.c b/fres/resalloc/fra_generic.c
index 68ed27d14b7bd8e1095fab84415ba3c9426efaac..673267a10def3d202258b1386e40f5c5b65e79c6 100644 (file)
--- a/fres/resalloc/fra_generic.c
+++ b/fres/resalloc/fra_generic.c
@@ -133,7 +133,7 @@ fres_vreses_find_label(fres_block_label *label, fres_block_resource *res)
 {
        struct fres_vres *item;
 
-       gavl_cust_for_each(fres_vreses_nolock, &fres_vreses.vreses, item) {
+       gavl_cust_for_each(fres_vreses_nolock, &fres_vreses, item) {
                struct fres_contract *c = item->perceived;
                fres_block_label *l = fres_contract_get_label(c);
                fres_block_resource *r = fres_contract_get_resource(c);

diff --git a/frsh_api/frsh_contract.c b/frsh_api/frsh_contract.c
index 31393e2a99153ea1a93e2a2a64290bba368bc689..4b262545c4f0b68f2afabd47fe7e1e95f874a130 100644 (file)
--- a/frsh_api/frsh_contract.c
+++ b/frsh_api/frsh_contract.c
@@ -62,6 +62,7 @@
 #include <fcb.h>
 #include "frsh_forb.h"
 #include <fra_generic.h>
+#include <frsh_energy_management.h>
 
 /**********************************/
 /* -----===== FRSH API =====----- */

diff --git a/frsh_api/frsh_power.c b/frsh_api/frsh_power.c
index e1cfa152d2606f0c53f90f40afaed28b0ff3bb8d..56381090975f2114270a0c1fa2eabaa426b5c104 100644 (file)
--- a/frsh_api/frsh_power.c
+++ b/frsh_api/frsh_power.c
@@ -15,9 +15,9 @@
 #include <fres_blocks.h>
 #include <fcb.h>
 #include <fra_generic.h>
-#include "frsh_forb.h"
-#include "fra_acpi_cpu.h"
-
+#include <frsh_forb.h>
+#include <fra_acpi_cpu.h>
+#include <fra_acpi_lcd.h>
 #include <frsh.h>
 
 static inline int __is_a_valid_power(level)
@@ -235,7 +235,7 @@ int frsh_resource_get_power_level
                }
                case FRSH_RT_LCD:
                {
-                       ret - fra_LCD_get_level(resource_id,
+                       ret = fra_LCD_get_level(resource_id,
                                                (int*) power_level);
                        if (ret) goto err;
 

diff --git a/frsh_api/frsh_vres.c b/frsh_api/frsh_vres.c
index c28e125174d09c947285abce33022d2217cbe991..aa4e229bf306ac162f292419b39e8ef9748de1a0 100644 (file)
--- a/frsh_api/frsh_vres.c
+++ b/frsh_api/frsh_vres.c
@@ -98,6 +98,9 @@ int frsh_resource_get_vres_from_label
        fres_block_resource *r;
        fres_block_label *label;
 
+       if (!contract_label || !vres) {
+               return FRSH_ERR_BAD_ARGUMENT;
+       }
        r = malloc(sizeof(*r));
        if (!r) return ENOMEM;
        r->resource_type = resource_type;
@@ -111,8 +114,8 @@ int frsh_resource_get_vres_from_label
        strncpy(label->label, contract_label, sizeof(label->label));
        label->label[sizeof(label->label)-1] = '\0';
 
-       vres = fres_vreses_find_label(label, r);
-       if (vres) return FRSH_NO_ERROR;
+       *vres = fres_vreses_find_label(label, r);
+       if (*vres) return FRSH_NO_ERROR;
 
        return FRSH_ERR_CONTRACT_LABEL_UNKNOWN;
 }

diff --git a/resources/acpi_lcd/fra_acpi_lcd.h b/resources/acpi_lcd/fra_acpi_lcd.h
index ad4ef2cad003870fc5f7cb1fcd67a06a5317a00f..acc0b91fbc63937f9813c6516db5c28501dc6ee4 100644 (file)
--- a/resources/acpi_lcd/fra_acpi_lcd.h
+++ b/resources/acpi_lcd/fra_acpi_lcd.h
@@ -1,5 +1,5 @@
-#ifndef ACPI_CPU
-#define ACPI_CPU
+#ifndef ACPI_LCD
+#define ACPI_LCD
 
 #include <string.h>
 #include <math.h>