This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository legacy-imlib2.
View the commit online.
commit 3adb01befd585e9ca23d72305d32410e12e23d86
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Thu May 4 07:34:59 2023 +0200
imlib2_load: Move time_us() to separate file
---
src/bin/Makefile.am | 19 ++++++++++---------
src/bin/imlib2_load.c | 25 ++-----------------------
src/bin/prog_util.c | 30 ++++++++++++++++++++++++++++++
src/bin/prog_util.h | 6 ++++++
4 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7b8b813..3317e72 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,31 +16,32 @@ imlib2_conv \
imlib2_load \
$(X_BASED_PROGS)
-SRCS_COMMON_X11 = prog_x11.c prog_x11.h
+SRCS_X11 = prog_x11.c prog_x11.h
+SRCS_UTIL = prog_util.c prog_util.h
imlib2_conv_SOURCES = imlib2_conv.c
imlib2_conv_LDADD = $(top_builddir)/src/lib/libImlib2.la
-imlib2_load_SOURCES = imlib2_load.c
+imlib2_load_SOURCES = imlib2_load.c $(SRCS_UTIL)
imlib2_load_LDADD = $(top_builddir)/src/lib/libImlib2.la $(CLOCK_LIBS)
-imlib2_show_SOURCES = imlib2_show.c $(SRCS_COMMON_X11)
+imlib2_show_SOURCES = imlib2_show.c $(SRCS_X11)
imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11 -lm
-imlib2_test_SOURCES = imlib2_test.c $(SRCS_COMMON_X11)
+imlib2_test_SOURCES = imlib2_test.c $(SRCS_X11)
imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
-imlib2_bumpmap_SOURCES = imlib2_bumpmap.c $(SRCS_COMMON_X11)
+imlib2_bumpmap_SOURCES = imlib2_bumpmap.c $(SRCS_X11)
imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
-imlib2_poly_SOURCES = imlib2_poly.c $(SRCS_COMMON_X11)
+imlib2_poly_SOURCES = imlib2_poly.c $(SRCS_X11)
imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
-imlib2_colorspace_SOURCES = imlib2_colorspace.c $(SRCS_COMMON_X11)
+imlib2_colorspace_SOURCES = imlib2_colorspace.c $(SRCS_X11)
imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
-imlib2_view_SOURCES = imlib2_view.c $(SRCS_COMMON_X11)
+imlib2_view_SOURCES = imlib2_view.c $(SRCS_X11)
imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
-imlib2_grab_SOURCES = imlib2_grab.c $(SRCS_COMMON_X11)
+imlib2_grab_SOURCES = imlib2_grab.c $(SRCS_X11)
imlib2_grab_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
diff --git a/src/bin/imlib2_load.c b/src/bin/imlib2_load.c
index a52c82f..33dcbbf 100644
--- a/src/bin/imlib2_load.c
+++ b/src/bin/imlib2_load.c
@@ -11,14 +11,11 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#if USE_MONOTONIC_CLOCK
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
#include <sys/mman.h>
#include <sys/stat.h>
+#include "prog_util.h"
+
#define PROG_NAME "imlib2_load"
#define LOAD_DEFER 0
@@ -54,24 +51,6 @@ usage(void)
printf(HELP);
}
-static unsigned int
-time_us(void)
-{
-#if USE_MONOTONIC_CLOCK
- struct timespec ts;
-
- clock_gettime(CLOCK_MONOTONIC, &ts);
-
- return (unsigned int)(ts.tv_sec * 1000000 + ts.tv_nsec / 1000);
-#else
- struct timeval timev;
-
- gettimeofday(&timev, NULL);
-
- return (unsigned int)(timev.tv_sec * 1000000 + timev.tv_usec);
-#endif
-}
-
static Imlib_Image *
image_load_fd(const char *file, int *perr)
{
diff --git a/src/bin/prog_util.c b/src/bin/prog_util.c
new file mode 100644
index 0000000..146e0a7
--- /dev/null
+++ b/src/bin/prog_util.c
@@ -0,0 +1,30 @@
+/*
+ * Utility functions
+ */
+#include "config.h"
+
+#if USE_MONOTONIC_CLOCK
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
+
+#include "prog_util.h"
+
+unsigned int
+time_us(void)
+{
+#if USE_MONOTONIC_CLOCK
+ struct timespec ts;
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+
+ return (unsigned int)(ts.tv_sec * 1000000 + ts.tv_nsec / 1000);
+#else
+ struct timeval timev;
+
+ gettimeofday(&timev, NULL);
+
+ return (unsigned int)(timev.tv_sec * 1000000 + timev.tv_usec);
+#endif
+}
diff --git a/src/bin/prog_util.h b/src/bin/prog_util.h
new file mode 100644
index 0000000..b783bfe
--- /dev/null
+++ b/src/bin/prog_util.h
@@ -0,0 +1,6 @@
+#ifndef PROG_UTIL_H
+#define PROG_UTIL_H
+
+unsigned int time_us(void);
+
+#endif /* PROG_UTIL_H */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
