FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SIGBUS on Debian x86_64 (original patch from Jérôme Guelfucci)

Browse Source 
Something strange happened when doing a comparison between a guint type
and sizeof(), turning it back to gint fixes the issue. Fix other
compiler warnings at the same time.
This commit is contained in:
Mike Massonnet
2010-06-13 19:19:41 +02:00
parent d40bd9362a
commit 9d8b776288
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -1,7 +1,7 @@
NULL = NULL =
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/include \ -I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-taskmanager\" \ -DG_LOG_DOMAIN=\"xfce4-taskmanager\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"

20
src/task-manager-linux.c
View File

@@ -42,12 +42,12 @@ get_memory_usage (guint64 *memory_total, guint64 *memory_free, guint64 *memory_c
while (found < 6 && fgets (buffer, 1024, file) != NULL) while (found < 6 && fgets (buffer, 1024, file) != NULL)
{ {
found += sscanf (buffer, "MemTotal:\t%llu kB", memory_total); found += sscanf (buffer, "MemTotal:\t%llu kB", (unsigned long long*)memory_total);
found += sscanf (buffer, "MemFree:\t%llu kB", memory_free); found += sscanf (buffer, "MemFree:\t%llu kB", (unsigned long long*)memory_free);
found += sscanf (buffer, "Cached:\t%llu kB", memory_cache); found += sscanf (buffer, "Cached:\t%llu kB", (unsigned long long*)memory_cache);
found += sscanf (buffer, "Buffers:\t%llu kB", memory_buffers); found += sscanf (buffer, "Buffers:\t%llu kB", (unsigned long long*)memory_buffers);
found += sscanf (buffer, "SwapTotal:\t%llu kB", swap_total); found += sscanf (buffer, "SwapTotal:\t%llu kB", (unsigned long long*)swap_total);
found += sscanf (buffer, "SwapFree:\t%llu kB", swap_free); found += sscanf (buffer, "SwapFree:\t%llu kB", (unsigned long long*)swap_free);
} }
fclose (file); fclose (file);
@@ -127,7 +127,7 @@ get_task_cmdline (Task *task)
{ {
FILE *file; FILE *file;
gchar filename[96]; gchar filename[96];
guint i; gint i;
gchar c; gchar c;
snprintf (filename, 96, "/proc/%i/cmdline", task->pid); snprintf (filename, 96, "/proc/%i/cmdline", task->pid);
@@ -135,7 +135,7 @@ get_task_cmdline (Task *task)
return FALSE; return FALSE;
/* Read full command byte per byte until EOF */ /* Read full command byte per byte until EOF */
for (i = 0; (c = fgetc (file)) != EOF && i < sizeof (task->cmdline) - 1; i++) for (i = 0; (c = fgetc (file)) != EOF && i < (gint)sizeof (task->cmdline) - 1; i++)
task->cmdline[i] = (c == '\0') ? ' ' : c; task->cmdline[i] = (c == '\0') ? ' ' : c;
task->cmdline[i] = '\0'; task->cmdline[i] = '\0';
if (task->cmdline[i-1] == ' ') if (task->cmdline[i-1] == ' ')
@@ -253,8 +253,8 @@ get_task_details (guint pid, Task *task)
&idummy, // itrealvalue time in jiffies to next SIGALRM send to this process &idummy, // itrealvalue time in jiffies to next SIGALRM send to this process
&idummy, // starttime jiffies the process startet after system boot &idummy, // starttime jiffies the process startet after system boot
&task->vsz, // vsize in bytes (unsigned long long*)&task->vsz, // vsize in bytes
&task->rss, // rss (number of pages in real memory) (unsigned long long*)&task->rss, // rss (number of pages in real memory)
dummy, // rlim limit in bytes for rss dummy, // rlim limit in bytes for rss
dummy, // startcode dummy, // startcode