neocturne/glslview
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unneeded headers from common.h, improve error handling

Browse source
This commit is contained in:
Matthias Schiffer 2016-02-04 20:00:02 +01:00
parent 05e2f21d27
commit d521cc0e83
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common.c
View file

@ -36,9 +36,9 @@
char *filename; char *filename;
float current_time = 0; float current_time = 0;
GLint param0 = 0; int param0 = 0;
GLint param1 = 0; int param1 = 0;
GLint param2 = 0; int param2 = 0;
static GLint time_loc; static GLint time_loc;

11
common.h
View file

@ -25,18 +25,13 @@
#pragma once #pragma once
#include <GL/glew.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_opengl.h>
extern char *filename; extern char *filename;
extern float current_time; extern float current_time;
extern GLint param0; extern int param0;
extern GLint param1; extern int param1;
extern GLint param2; extern int param2;
void load(void); void load(void);

18
glslview.c
View file

@ -25,14 +25,20 @@
#include "common.h" #include "common.h"
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <GL/glew.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_opengl.h>
#ifdef USE_INOTIFY #ifdef USE_INOTIFY
# include <sys/inotify.h> # include <sys/inotify.h>
# include <sys/stat.h> # include <sys/stat.h>
@ -53,22 +59,20 @@ static int inotify_watch = -1;
static void reset_watch(void) { static void reset_watch(void) {
if (inotify_watch >= 0) { if (inotify_watch >= 0) {
if (inotify_rm_watch(inotify_fd, inotify_watch)) { if (inotify_rm_watch(inotify_fd, inotify_watch)) {
fprintf(stderr, "unable to remove watch\n"); fprintf(stderr, "unable to remove watch: %s\n", strerror(errno));
exit(1); exit(1);
} }
} }
inotify_watch = inotify_add_watch(inotify_fd, filename, IN_CLOSE_WRITE); inotify_watch = inotify_add_watch(inotify_fd, filename, IN_CLOSE_WRITE);
if (inotify_watch < 0) { if (inotify_watch < 0)
fprintf(stderr, "unable to watch '%s' for changes\n", filename); fprintf(stderr, "unable to watch '%s' for changes: %s\n", filename, strerror(errno));
return;
}
} }
static void init_watch(void) { static void init_watch(void) {
inotify_fd = inotify_init(); inotify_fd = inotify_init();
if (inotify_fd < 0) { if (inotify_fd < 0) {
fprintf(stderr, "unable to initialize inotify\n"); fprintf(stderr, "unable to initialize inotify: %s\n", strerror(errno));
exit(1); exit(1);
} }