projects
/
my-code
/
ivac.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
99e577c
)
testing display related segfaults .. :(
author
hackbard
<hackbard>
Sat, 5 Jun 2004 02:09:02 +0000
(
02:09
+0000)
committer
hackbard
<hackbard>
Sat, 5 Jun 2004 02:09:02 +0000
(
02:09
+0000)
src/ivac.c
patch
|
blob
|
history
diff --git
a/src/ivac.c
b/src/ivac.c
index
281b1a5
..
e959ef8
100644
(file)
--- a/
src/ivac.c
+++ b/
src/ivac.c
@@
-138,7
+138,7
@@
int main(int argc,char **argv) {
/* display init */
display_init(&(ivac.display));
/* display init */
display_init(&(ivac.display));
-
+
/* display */
ivac_display(&ivac);
ivac_display_content(&ivac);
/* display */
ivac_display(&ivac);
ivac_display_content(&ivac);
@@
-315,6
+315,12
@@
int ivac_event_cb(t_event *event,void *ptr) {
int ivac_regular_cb(t_event *event,void *ptr) {
int ivac_regular_cb(t_event *event,void *ptr) {
+ t_ivac *ivac;
+
+ ivac=(t_ivac *)ptr;
+
+ ivac_add_to_monitor(ivac,"event HUGH");
+
/* usual jobs like audio & video transmit ... */
return SUCCESS;
/* usual jobs like audio & video transmit ... */
return SUCCESS;
@@
-343,18
+349,8
@@
int ivac_parse_command(t_input *input,void *ptr) {
ivac_add_to_monitor(ivac,"nach display refresh");
#endif
ivac_add_to_monitor(ivac,"nach display refresh");
#endif
-#ifdef DEBUG
- ivac_add_to_monitor(ivac,"nach display refresh");
-#endif
-
-#ifdef DEBUG
-
- strcpy(debug_string,"hahahaha!");
- ivac_add_to_monitor(ivac,debug_string);
-#endif
-
/* parse command routines */
/* parse command routines */
- if(data[input->c_count-1]=='\n'
||
data[input->c_count-1]=='\r') {
+ if(data[input->c_count-1]=='\n'
||
data[input->c_count-1]=='\r') {
#ifdef DEBUG
ivac_add_to_monitor(ivac,"got newline or carriage return!");
#ifdef DEBUG
ivac_add_to_monitor(ivac,"got newline or carriage return!");
@@
-366,11
+362,11
@@
int ivac_parse_command(t_input *input,void *ptr) {
/* get args */
len=0;
/* get args */
len=0;
- while(data[len]!='\n') len++;
+ while(data[len]!='\n'
||data[len]!='\r'
) len++;
i=0; j=0;
while((i<len) && (j<IVAC_ARG_COUNT)) {
k=0;
i=0; j=0;
while((i<len) && (j<IVAC_ARG_COUNT)) {
k=0;
- while((data[i+k]!=' ')&&(data[i+k]!='\n')) {
+ while((data[i+k]!=' ')&&(data[i+k]!='\n'
||data[i+k]!='\r'
)) {
arg[j][k]=data[i+k];
k++;
}
arg[j][k]=data[i+k];
k++;
}