Skip to content

Commit 0ca6805

Browse files
committed
Some optimizations
1 parent 1bb0989 commit 0ca6805

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

src/fetch.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,33 @@
1313

1414
#define COLOUR_RESET "\e[0m"
1515

16-
void fetch_kernel(char *buffer, size_t buffer_size) {
16+
void fetch_kernel(char *buffer, const size_t buffer_size) {
1717
struct utsname local_machine;
1818
uname(&local_machine);
1919
sprintf(buffer ,"%s %s", local_machine.sysname, local_machine.release );
2020
}
2121

22-
void fetch_architecture(char *buffer, size_t buffer_size) {
22+
void fetch_architecture(char *buffer, const size_t buffer_size) {
2323
struct utsname local_machine;
2424
uname(&local_machine);
2525
sprintf(buffer, "%s", local_machine.machine);
2626
}
2727

28-
void fetch_distro(char *buffer, size_t buffer_size) {
28+
void fetch_distro(char *buffer, const size_t buffer_size) {
2929
FILE *distroinfo = fopen("/etc/os-release", "rb");
3030
osParse(distroinfo, buffer, "PRETTY_NAME");
3131
fclose(distroinfo);
3232
}
3333

34-
void fetch_colourblocks(char *buffer, size_t buffer_size) {
34+
void fetch_colourblocks(char *buffer, const size_t buffer_size) {
3535
size_t offset = 0;
3636
for (int i = 0; i < 8; i++) {
3737
offset += sprintf(buffer + offset, "\e[%dm\e[%dm ", i + 30, i + 40);
3838
}
3939
offset += sprintf(buffer + offset, "%s", COLOUR_RESET);
4040
}
4141

42-
void fetch_colour(char *buffer, size_t buffer_size) {
42+
void fetch_colour(char *buffer, const size_t buffer_size) {
4343
FILE *distroinfo = fopen("/etc/os-release", "rb");
4444
strcpy(buffer, "\e[");
4545
osParse(distroinfo, buffer + strlen(buffer), "ANSI_COLOR");
@@ -49,11 +49,11 @@ void fetch_colour(char *buffer, size_t buffer_size) {
4949
fclose(distroinfo);
5050
}
5151

52-
void fetch_hostname(char *buffer, size_t buffer_size) {
52+
void fetch_hostname(char *buffer, const size_t buffer_size) {
5353
gethostname(buffer, buffer_size);
5454
}
5555

56-
void fetch_uptime(char *buffer, size_t buffer_size) {
56+
void fetch_uptime(char *buffer, const size_t buffer_size) {
5757
struct sysinfo machine_info;
5858
sysinfo(&machine_info);
5959

@@ -84,13 +84,13 @@ void fetch_uptime(char *buffer, size_t buffer_size) {
8484
sprintf(buffer + bytes_written, "%ld second%s", uptime_seconds, plurality);
8585
}
8686

87-
void fetch_cpumodel(char *buffer, size_t buffer_size) {
87+
void fetch_cpumodel(char *buffer, const size_t buffer_size) {
8888
FILE *cpuinfo = fopen("/proc/cpuinfo", "rb");
8989
procParse(cpuinfo, buffer, "model name");
9090
fclose(cpuinfo);
9191
}
9292

93-
void fetch_memory(char *buffer, size_t buffer_size) {
93+
void fetch_memory(char *buffer, const size_t buffer_size) {
9494
FILE *meminfo = fopen("/proc/meminfo", "rb");
9595
// TODO: CHange these arbitrary values to something a little more known
9696
char memtotal[16]; procParse(meminfo, memtotal, "MemTotal");
@@ -102,7 +102,7 @@ void fetch_memory(char *buffer, size_t buffer_size) {
102102
fclose(meminfo);
103103
}
104104

105-
void fetch_model(char *buffer, size_t buffer_size) {
105+
void fetch_model(char *buffer, const size_t buffer_size) {
106106
FILE *model = fopen("/sys/devices/virtual/dmi/id/product_name", "rb");
107107
char *modelname = readFirstline(model);
108108
strcpy(buffer, modelname);

src/fetchline.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "fetchline.h"
22
#include <stdio.h>
33

4-
size_t align_fetchlist(fetchlist *fetcharray, size_t count) {
4+
size_t align_fetchlist(fetchlist *fetcharray, const size_t count) {
55
size_t max_length = 0;
66
size_t current_length;
77
// We assume that the given title won't be over half the maximum, ideally I would do something smarter here.
@@ -10,9 +10,7 @@ size_t align_fetchlist(fetchlist *fetcharray, size_t count) {
1010

1111
for (size_t i = 0; i < count; i++) {
1212
current_length = strlen(fetcharray[i].title);
13-
if (current_length > max_length) {
14-
max_length = current_length;
15-
}
13+
max_length = (current_length > max_length) ? current_length : max_length;
1614
}
1715
for (size_t i = 0; i < count; i++) {
1816
current_length = strlen(fetcharray[i].title);

0 commit comments

Comments
 (0)