Changeset 12332 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• book_commands.c (modified) (3 diffs)
• create.c (modified) (1 diff)
• line.c (modified) (1 diff)
• queueload.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/book_commands.c

@@ -8 +8 @@
 
   ListBooks();
+  return TRUE;
 }
 
@@ -63 +64 @@
 int book_listbook (int argc, char **argv) {
 
-  int status;
   Book *book;
 
@@ -83 +83 @@
 int book_npages (int argc, char **argv) {
 
-  int N, status;
+  int N;
   Book *book;
   char *varName;

trunk/Ohana/src/opihi/cmd.data/create.c

@@ -3 +3 @@
 int create (int argc, char **argv) {
   
-  int i, N;
+  int i;
   float start, end, delta;
   Vector *vec;

trunk/Ohana/src/opihi/cmd.data/line.c

@@ -3 +3 @@
 int line (int argc, char **argv) {
   
-  int N, Npts;
   Graphdata graphmode;
   float x[2], y[2];

trunk/Ohana/src/opihi/cmd.data/queueload.c

@@ -4 +4 @@
   
   char *A, *B, *val;
-  int i, done, status;
-  int N, Nread, Nbytes, NBYTES;
+  int i, status;
+  int Nread, Nbytes, NBYTES;
   FILE *f;
   Queue *queue;