diff options
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/fs/procfs/fs_procfscpuload.c | 2 | ||||
| -rw-r--r-- | nuttx/fs/procfs/fs_procfsproc.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 3dc953339..400173b4e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6677,3 +6677,6 @@ time constant related delay elapsed. The total count is now always guaranteed to add up to 100% (excepting only truncation errors) (2014-2-27). + * fs/procfs/fs_procfscpuload.c and fs_procfsproc.c: Remove the newline + at the end of the percentage so that the returned strings can be + printed on the same line as other values (2014-2-27). diff --git a/nuttx/fs/procfs/fs_procfscpuload.c b/nuttx/fs/procfs/fs_procfscpuload.c index 75572dee3..87883926e 100644 --- a/nuttx/fs/procfs/fs_procfscpuload.c +++ b/nuttx/fs/procfs/fs_procfscpuload.c @@ -256,7 +256,7 @@ static ssize_t cpuload_read(FAR struct file *filep, FAR char *buffer, fracpart = 0; } - linesize = snprintf(attr->line, CPULOAD_LINELEN, "%3d.%01d%%\n", + linesize = snprintf(attr->line, CPULOAD_LINELEN, "%3d.%01d%%", intpart, fracpart); /* Save the linesize in case we are re-entered with f_pos > 0 */ diff --git a/nuttx/fs/procfs/fs_procfsproc.c b/nuttx/fs/procfs/fs_procfsproc.c index 0782479b0..8e25dcc8e 100644 --- a/nuttx/fs/procfs/fs_procfsproc.c +++ b/nuttx/fs/procfs/fs_procfsproc.c @@ -583,7 +583,7 @@ static ssize_t proc_loadavg(FAR struct proc_file_s *procfile, fracpart = 0; } - linesize = snprintf(procfile->line, STATUS_LINELEN, "%3d.%01d%%\n", + linesize = snprintf(procfile->line, STATUS_LINELEN, "%3d.%01d%%", intpart, fracpart); copysize = procfs_memcpy(procfile->line, linesize, buffer, buflen, &offset); |