v1.0.2
Stefan Schuermans commited on 2011-09-11 17:14:43
Showing 24 changed files, with 45 additions and 34 deletions.
- ChangeLog b47008d..d46ef9e
- Makefile 94fdbc4..ae66efc
- README 5a41ce0..0353bb0
- include/flexipix/display.h 85ad201..5105c0e
- include/flexipix/displayer.h eef2743..547e0c3
- include/flexipix/flexipix.h 15f6fc5..cca3c6e
- include/flexipix/info.h 2364bf2..5dd2bd7
- include/flexipix/msg.h ae05321..a742552
- include/flexipix/types.h f4ba248..9cbaec2
- include/intern/config.h 18a7c7a..a23de71
- include/intern/const_data.h db8915f..78fb094
- include/intern/constants.h ef33547..350f02a
- include/intern/displayer.h 2ce5d31..3f537fb
- include/intern/mapping.h 4d9f4a0..f04ae3e
- include/intern/net.h 9dee389..46f58dc
- include/intern/parse.h 4d12fc6..8d0555c
- include/intern/types.h 499c000..1e0d2f4
- src/config.c 55d2f8e..48de269
- src/const_data.c d465e64..be4d515
- src/display.c d691232..453998a
- src/displayer.c c20d2b0..e43b72d
- src/info.c 3a8b245..49b6528
- src/mapping.c 4e2f603..a38d387
- src/parse.c a1d2629..f541602
| ... | ... |
@@ -1,5 +1,5 @@ |
| 1 | 1 |
# FlexiPix library |
| 2 |
-# !version: 1.0.1! !date: 2010-08-19! |
|
| 2 |
+# !version: 1.0.2! !date: 2010-08-30! |
|
| 3 | 3 |
# |
| 4 | 4 |
# Copyright 2010 Stefan Schuermans <stefan schuermans info> |
| 5 | 5 |
# |
| ... | ... |
@@ -19,7 +19,7 @@ |
| 19 | 19 |
LIBTARGET=libflexipix |
| 20 | 20 |
VER=1 |
| 21 | 21 |
VERMIN=0 |
| 22 |
-VERREV=1 |
|
| 22 |
+VERREV=2 |
|
| 23 | 23 |
|
| 24 | 24 |
SRCS=$(wildcard src/*.c) |
| 25 | 25 |
EX_SRCS=$(wildcard examples/src/*.c) |
| ... | ... |
@@ -121,8 +121,8 @@ pack: |
| 121 | 121 |
$(MAKE) clean |
| 122 | 122 |
mkdir -p pack/$(PACKNAME) |
| 123 | 123 |
cp -r $(PACKDATA) pack/$(PACKNAME) |
| 124 |
- sed -i 's/!version: 1.0.1!]*!/!version: 1.0.1!/g' $$(find pack -type f) |
|
| 125 |
- sed -i 's/!date: 2010-08-19!]*!/!date: 2010-08-19!/g' $$(find pack -type f) |
|
| 124 |
+ sed -i 's/!version: 1.0.2!]*!/!version: 1.0.2!/g' $$(find pack -type f) |
|
| 125 |
+ sed -i 's/!date: 2010-08-30!]*!/!date: 2010-08-30!/g' $$(find pack -type f) |
|
| 126 | 126 |
cd pack; tar jcf ../$(PACKNAME).tar.bz2 $(PACKNAME) |
| 127 | 127 |
$(MAKE) clean |
| 128 | 128 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
/* |
| 2 | 2 |
* FlexiPix library |
| 3 |
- * !version: 1.0.1! !date: 2010-08-19! |
|
| 3 |
+ * !version: 1.0.2! !date: 2010-08-30! |
|
| 4 | 4 |
* |
| 5 | 5 |
* Copyright 2010 Stefan Schuermans <stefan schuermans info> |
| 6 | 6 |
* |
| ... | ... |
@@ -601,10 +601,13 @@ int flp_config_proc_file(flp_display_t *p_display, |
| 601 | 601 |
/* open file */ |
| 602 | 602 |
file = fopen(sz_config_file, "rt"); |
| 603 | 603 |
if (!file) {
|
| 604 |
- if (p_msg_func) |
|
| 604 |
+ if (p_msg_func) {
|
|
| 605 |
+ char errmsg[256]; |
|
| 606 |
+ strerror_r(errno, errmsg, sizeof(errmsg)); |
|
| 605 | 607 |
p_msg_func(p_msg_ctx, flp_msg_type_err, |
| 606 | 608 |
"cannot open config file \"%s\" for reading: %s\n", |
| 607 |
- sz_config_file, strerror(errno)); |
|
| 609 |
+ sz_config_file, errmsg); |
|
| 610 |
+ } |
|
| 608 | 611 |
return -1; |
| 609 | 612 |
} |
| 610 | 613 |
|
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
/* |
| 2 | 2 |
* FlexiPix library |
| 3 |
- * !version: 1.0.1! !date: 2010-08-19! |
|
| 3 |
+ * !version: 1.0.2! !date: 2010-08-30! |
|
| 4 | 4 |
* |
| 5 | 5 |
* Copyright 2010 Stefan Schuermans <stefan schuermans info> |
| 6 | 6 |
* |
| ... | ... |
@@ -81,10 +81,12 @@ flp_display_t *flp_display_create(const char *sz_config_file, |
| 81 | 81 |
p_display->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); |
| 82 | 82 |
if (p_display->sock < 0) {
|
| 83 | 83 |
flp_display_free(p_display); |
| 84 |
- if (p_msg_func) |
|
| 84 |
+ if (p_msg_func) {
|
|
| 85 |
+ char errmsg[256]; |
|
| 86 |
+ strerror_r(errno, errmsg, sizeof(errmsg)); |
|
| 85 | 87 |
p_msg_func(p_msg_ctx, flp_msg_type_err, |
| 86 |
- "could not create UDP socket: %s\n", |
|
| 87 |
- strerror(errno)); |
|
| 88 |
+ "could not create UDP socket: %s\n", errmsg); |
|
| 89 |
+ } |
|
| 88 | 90 |
return NULL; |
| 89 | 91 |
} |
| 90 | 92 |
|
| ... | ... |
@@ -92,12 +94,14 @@ flp_display_t *flp_display_create(const char *sz_config_file, |
| 92 | 94 |
if (bind(p_display->sock, (struct sockaddr *)&p_display->bind_addr, |
| 93 | 95 |
sizeof (p_display->bind_addr))) {
|
| 94 | 96 |
flp_display_free(p_display); |
| 95 |
- if (p_msg_func) |
|
| 97 |
+ if (p_msg_func) {
|
|
| 98 |
+ char errmsg[256]; |
|
| 99 |
+ strerror_r(errno, errmsg, sizeof(errmsg)); |
|
| 96 | 100 |
p_msg_func(p_msg_ctx, flp_msg_type_err, |
| 97 | 101 |
"could not bind UDP socket to \"%s:%u\": %s\n", |
| 98 | 102 |
inet_ntoa(p_display->bind_addr.sin_addr), |
| 99 |
- (unsigned int)ntohs(p_display->bind_addr.sin_port), |
|
| 100 |
- strerror(errno)); |
|
| 103 |
+ (unsigned int)ntohs(p_display->bind_addr.sin_port), errmsg); |
|
| 104 |
+ } |
|
| 101 | 105 |
return NULL; |
| 102 | 106 |
} |
| 103 | 107 |
|