Changeset 9fae46b

Timestamp:

02/28/06 15:30:47 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

4aa4615

Parents:

5b66921

Message:

Minor fixes regarding the return values for dag_init_input and rt_init_input

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• format_rt.c (modified) (5 diffs)

lib/format_erf.c

@@ -155 +155 @@
 #ifdef HAVE_DAG
 static int dag_init_input(struct libtrace_t *libtrace) {
-        libtrace->format_data = (struct libtrace_format_data_t *)
-                malloc(sizeof(struct libtrace_format_data_t));
+        libtrace->format_data = (struct erf_format_data_t *)
+                malloc(sizeof(struct erf_format_data_t));
+        return 0;
 }
 

lib/format_rt.c

@@ -114 +114 @@
         if ((he=gethostbyname(RT_INFO->hostname)) == NULL) {
                 perror("gethostbyname");
-                return 0;
+                return -1;
         }
         if ((RT_INFO->input_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
                 perror("socket");
-                return 0;
+                return -1;
         }
 
@@ -129 +129 @@
                                 sizeof(struct sockaddr)) == -1) {
                 perror("connect (inet)");
-                return 0;
+                return -1;
         }
         
@@ -136 +136 @@
         if (recv(RT_INFO->input_fd, &connect_msg, sizeof(rt_header_t), 0) != sizeof(rt_header_t) ) {
                 printf("An error occured while connecting to %s\n", RT_INFO->hostname);
-                return 0;
+                return -1;
         }
 
@@ -150 +150 @@
                         printf("Connection attempt is denied by the server: %s\n",
                                         rt_deny_reason(reason));
-                        return 0;
+                        return -1;
                 case RT_HELLO:
                         /* do something with options */
@@ -162 +162 @@
                         reliability = hello_opts.reliable;
                         
-                        return 1;
+                        return 0;
                 default:
                         printf("Unexpected message type: %d\n", connect_msg.type);
-                        return 0;
-        }
-        
-        return 0;
+                        return -1;
+        }
+        
+        return -1;
 }