~ubuntu-branches/ubuntu/wily/fwts/wily

« back to all changes in this revision

Viewing changes to src/lib/src/fwts_pm_method.c

  • Committer: Package Import Robot
  • Author(s): Ivan Hu, Alex Hung, Colin Ian King, Ivan Hu, Naresh Bhat
  • Date: 2015-01-21 10:39:00 UTC
  • mfrom: (34.2.23)
  • Revision ID: package-import@ubuntu.com-20150121103900-eozocxj45stjs43n
Tags: 15.01.00-0ubuntu0
[Alex Hung]
* live-image/fwts-frontend-text: skip moving and avoid overwritting
  results.html (LP: #1322520)
* acpi: method: add check for _PSD
* acpi: method: add check for _PRW

[Colin Ian King]
* acpi: acpidump: reduce scope of variables
* acpi: battery: reduce scope of variables
* acpi: brightness: reduce scope of variables
* acpi: brightness: reduce scope of variables
* acpi: crsdump: reduce scope of variables
* acpi: lid: reduce scope of variables
* utilities: kernelscan: reduce scope of variables
* uefi: uefirtvariable: reduce scope of variables
* acpi: dmar: reduce scope of variables
* acpi: pcc: reduce scope of variables
* acpi: method: reduce scope of variables
* acpi: s3: reduce scope of variables
* acpi: s3power: reduce scope of variables
* acpi: s4: reduce scope of variables
* bios: hdaaudio: reduce scope of variables
* bios: mtrr: reduce scope of variables
* bios: multiproc: reduce scope of variables
* cpu: cpufreq: reduce scope of variables
* cpu: maxfreq: reduce scope of variables
* cpu: microcode: reduce scope of variables
* cpu: msr: reduce scope of variables
* cpu: nx: reduce scope of variables
* hotkey: reduce scope of variables
* hpet: hpet_check: reduce scope of variables
* lib: fwts_acpi_tables: reduce scope of variables
* lib: fwts_backtrace: reduce scope of variables
* lib: fwts_battery: reduce scope of variables
* lib: fwts_dump: replace asctime with strftime
* lib: fwts_efi_module: reduce scope of variable
* cmos: cmosdump: clarify precedence for & and ?
* lib: fwts_framework: fix some minor style warnings from cppcheck
* lib: fwts_gpe: reduce scope of variables
* lib: fwts_memorymap: fix typo on memory comparison sort
* lib: fwts_memorymap: reduce scope of variables
* lib: fwts_log: reduce scope of variables
* lib: fwts_pm_method: reduce scope of variables
* reduce scope of variables
* lib: fwts_uefi: reduce scope of variables
* pci: aspm: reduce scope of variables
* lib: klog: reduce scope of variables
* uefi: uefibootpath: reduce scope of variables
* uefi: securebootcert: reduce scope of variables
* uefi: uefidump: reduce scope of variables
* uefi: uefirtauthvar: reduce scope of variables
* uefi: uefirtmisc: reduce scope of variables
* uefi: uefivarinfo: reduce scope of variables

[Ivan Hu]
* uefibootpath: include the null-terminated space in device path length
* fwts-test: update fwts tests to sync with method tests

[Naresh Bhat]
* makefile.am : Use sysroot path for json

Show diffs side-by-side

added added

removed removed

Lines of Context:
31
31
static gboolean logind_do(gpointer data)
32
32
{
33
33
        GError *error = NULL;
34
 
        GVariant *reply;
35
34
        fwts_pm_method_vars *fwts_settings = (fwts_pm_method_vars *)data;
36
35
 
37
36
        /* If the loop is not running, return TRUE so as to repeat the operation */
38
37
        if (g_main_loop_is_running (fwts_settings->gmainloop)) {
 
38
                GVariant *reply;
 
39
 
39
40
                fwts_log_info(fwts_settings->fw, "Requesting %s action\n", fwts_settings->action);
40
41
                reply = g_dbus_proxy_call_sync(fwts_settings->logind_proxy,
41
42
                        fwts_settings->action,
108
109
        gpointer user_data)
109
110
{
110
111
        gboolean status, is_s3;
111
 
        char buffer[50];
112
112
        fwts_pm_method_vars *fwts_settings = (fwts_pm_method_vars *)user_data;
113
113
 
114
114
        /* Prevent -Werror=unused-parameter from complaining */
133
133
                        status ? "true" : "false");
134
134
 
135
135
                if (status) {
136
 
                        time(&(fwts_settings->t_start));
 
136
                        char buffer[50];
 
137
 
 
138
                        (void)time(&(fwts_settings->t_start));
137
139
                        snprintf(buffer, sizeof(buffer), "Starting fwts %s\n", is_s3 ? "suspend" : "hibernate");
138
140
                        (void)fwts_klog_write(fwts_settings->fw, buffer);
139
141
                        snprintf(buffer, sizeof(buffer), "%s\n", fwts_settings->action);