Fix warnings introduced by prior commit

This commit is contained in:
Drew DeVault 2015-09-18 07:27:35 -04:00
parent 8e25ce4e57
commit 318e1be240
7 changed files with 19 additions and 3 deletions

View file

@ -2,6 +2,11 @@
#define _SWAY_STRINGOP_H #define _SWAY_STRINGOP_H
#include "list.h" #include "list.h"
#if !HAVE_DECL_SETENV
// Not sure why we need to provide this
extern int setenv(const char *, const char *, int);
#endif
// array of whitespace characters to use for delims // array of whitespace characters to use for delims
extern const char *whitespace; extern const char *whitespace;

View file

@ -5,6 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>

View file

@ -1,7 +1,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <strings.h> #include <strings.h>
#include <string.h>
#include "config.h" #include "config.h"
#include "stringop.h"
#include "container.h" #include "container.h"
#include "workspace.h" #include "workspace.h"
#include "focus.h" #include "focus.h"

View file

@ -80,9 +80,7 @@ void sway_log_errno(log_importance_t verbosity, char* format, ...) {
va_end(args); va_end(args);
fprintf(stderr, ": "); fprintf(stderr, ": ");
char error[256]; fprintf(stderr, "%s", strerror(errno));
strerror_r(errno, error, sizeof(error));
fprintf(stderr, "%s", error);
if (colored && isatty(STDERR_FILENO)) { if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "\x1B[0m"); fprintf(stderr, "\x1B[0m");

View file

@ -7,6 +7,7 @@
#include <signal.h> #include <signal.h>
#include <getopt.h> #include <getopt.h>
#include "layout.h" #include "layout.h"
#include "stringop.h"
#include "config.h" #include "config.h"
#include "log.h" #include "log.h"
#include "readline.h" #include "readline.h"

View file

@ -311,3 +311,11 @@ char *join_list(list_t *list, char *separator) {
return res; return res;
} }
char *strdup(const char *str) {
char *dup = malloc(strlen(str) + 1);
if (dup) {
strcpy(dup, str);
}
return dup;
}

View file

@ -2,6 +2,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <wlc/wlc.h> #include <wlc/wlc.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include "workspace.h" #include "workspace.h"
#include "layout.h" #include "layout.h"
#include "list.h" #include "list.h"