Breaks configfiles! Major refactoring of i3status, see below

[i3/i3status] / src / general.c

diff --git a/src/general.c b/src/general.c
index 62d242db6fa387c5bb7f9feb81a61298a865065d..a093c160d73eb874645f5a1702eda143f6859cea 100644 (file)
--- a/src/general.c
+++ b/src/general.c
@@ -13,14 +13,16 @@
  * Reads size bytes into the destination buffer from filename.
  *
  */
-void slurp(char *filename, char *destination, int size) {
+bool slurp(char *filename, char *destination, int size) {
         int fd;
 
         if ((fd = open(filename, O_RDONLY)) == -1)
-                die("Could not open \"%s\"\n", filename);
+                return false;
 
         (void)read(fd, destination, size);
         (void)close(fd);
+
+        return true;
 }
 
 /*
@@ -51,21 +53,6 @@ void die(const char *fmt, ...) {
         (void)vsnprintf(buffer, sizeof(buffer), fmt, ap);
         va_end(ap);
 
-        if (wmii_path != NULL)
-                write_error_to_statusbar(buffer);
-        else
-                fprintf(stderr, "%s", buffer);
+        fprintf(stderr, "%s", buffer);
         exit(EXIT_FAILURE);
 }
-
-/*
- * This function just concats two strings in place, it should only be used
- * for concatting order to the name of a file or concatting color codes.
- * Otherwise, the buffer size would have to be increased.
- *
- */
-char *order_to_str(int number, char *name) {
-        static char buf[32];
-        (void)snprintf(buf, sizeof(buf), "%d%s", number, name);
-        return buf;
-}