chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5 from elogind/dev_v227
[elogind.git]
/
src
/
shared
/
sleep-config.c
diff --git
a/src/shared/sleep-config.c
b/src/shared/sleep-config.c
index ae14c6bd4ddb3e9aba43295fb88dc78eeba6f098..3dedbd1f6269db89a72569a466b9ce7a4296300d 100644
(file)
--- a/
src/shared/sleep-config.c
+++ b/
src/shared/sleep-config.c
@@
-167,7
+167,7
@@
int can_sleep_disk(char **types) {
static int hibernation_partition_size(size_t *size, size_t *used) {
_cleanup_fclose_ FILE *f;
static int hibernation_partition_size(size_t *size, size_t *used) {
_cleanup_fclose_ FILE *f;
-
int
i;
+
unsigned
i;
assert(size);
assert(used);
assert(size);
assert(used);
@@
-190,8
+190,8
@@
static int hibernation_partition_size(size_t *size, size_t *used) {
k = fscanf(f,
"%ms " /* device/file */
"%ms " /* type of swap */
k = fscanf(f,
"%ms " /* device/file */
"%ms " /* type of swap */
- "%z
d
" /* swap size */
- "%z
d
" /* used */
+ "%z
u
" /* swap size */
+ "%z
u
" /* used */
"%*i\n", /* priority */
&dev, &type, &size_field, &used_field);
if (k != 4) {
"%*i\n", /* priority */
&dev, &type, &size_field, &used_field);
if (k != 4) {
@@
-226,7
+226,7
@@
static bool enough_memory_for_hibernation(void) {
if (r < 0)
return false;
if (r < 0)
return false;
- r = get_
status_field("/proc/meminfo", "\nActive(anon):"
, &active);
+ r = get_
proc_field("/proc/meminfo", "Active(anon)", WHITESPACE
, &active);
if (r < 0) {
log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;
if (r < 0) {
log_error_errno(r, "Failed to retrieve Active(anon) from /proc/meminfo: %m");
return false;