diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-09-18 07:27:35 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-09-18 07:27:35 -0400 |
| commit | 318e1be240574e316094e5ea73d32e9f9a1f7c04 (patch) | |
| tree | b93c54cba11fd92adb56dce49261d9adb88991fd /sway | |
| parent | 8e25ce4e5763c74864587b0a78217eb20c299afe (diff) | |
| download | sway-318e1be240574e316094e5ea73d32e9f9a1f7c04.tar.xz | |
Fix warnings introduced by prior commit
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 1 | ||||
| -rw-r--r-- | sway/container.c | 2 | ||||
| -rw-r--r-- | sway/log.c | 4 | ||||
| -rw-r--r-- | sway/main.c | 1 | ||||
| -rw-r--r-- | sway/stringop.c | 8 | ||||
| -rw-r--r-- | sway/workspace.c | 1 |
6 files changed, 14 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index 71eb9d70..68bdff2c 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -5,6 +5,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> +#include <strings.h> #include <unistd.h> #include <ctype.h> #include <sys/types.h> diff --git a/sway/container.c b/sway/container.c index ef0e6c55..85b169a1 100644 --- a/sway/container.c +++ b/sway/container.c @@ -1,7 +1,9 @@ #include <stdlib.h> #include <stdbool.h> #include <strings.h> +#include <string.h> #include "config.h" +#include "stringop.h" #include "container.h" #include "workspace.h" #include "focus.h" @@ -80,9 +80,7 @@ void sway_log_errno(log_importance_t verbosity, char* format, ...) { va_end(args); fprintf(stderr, ": "); - char error[256]; - strerror_r(errno, error, sizeof(error)); - fprintf(stderr, "%s", error); + fprintf(stderr, "%s", strerror(errno)); if (colored && isatty(STDERR_FILENO)) { fprintf(stderr, "\x1B[0m"); diff --git a/sway/main.c b/sway/main.c index 97243f99..66921184 100644 --- a/sway/main.c +++ b/sway/main.c @@ -7,6 +7,7 @@ #include <signal.h> #include <getopt.h> #include "layout.h" +#include "stringop.h" #include "config.h" #include "log.h" #include "readline.h" diff --git a/sway/stringop.c b/sway/stringop.c index 191e40c8..7a2c8317 100644 --- a/sway/stringop.c +++ b/sway/stringop.c @@ -311,3 +311,11 @@ char *join_list(list_t *list, char *separator) { return res; } + +char *strdup(const char *str) { + char *dup = malloc(strlen(str) + 1); + if (dup) { + strcpy(dup, str); + } + return dup; +} diff --git a/sway/workspace.c b/sway/workspace.c index 658f79bc..c169c1cb 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -2,6 +2,7 @@ #include <stdbool.h> #include <wlc/wlc.h> #include <string.h> +#include <strings.h> #include "workspace.h" #include "layout.h" #include "list.h" |