Changeset 11205 for fact/BIASctrl

Timestamp:

06/28/11 14:28:46 (14 years ago)

Author:

ogrimm

Message:

Adaptions to allow compilation on Ubuntu

Location:

fact/BIASctrl

Files:

• BIASctrl.cc (modified) (1 diff)
• Crate.cc (modified) (1 diff)
• History.txt (modified) (1 diff)
• Makefile (modified) (1 diff)
• User.cc (modified) (2 diffs)

fact/BIASctrl/BIASctrl.cc

@@ -29 +29 @@
   siginterrupt(SIGTERM, true);
 
-  system("clear");                   
+  if (system("clear") == -1) printf("Error with system() call\n");
+                   
   printf("\n*** BIASctrl (compiled %s, %s) ***\n\n", __DATE__, __TIME__);
    

fact/BIASctrl/Crate.cc

@@ -134 +134 @@
         FD_ZERO(&SelectDescriptor);   FD_SET(fDescriptor, &SelectDescriptor);
         if (select(fDescriptor+1, &SelectDescriptor, NULL, NULL, &WaitTime)==-1) {
-          if (errno = EINTR) goto ExitCommunicate;  // in case program is exiting
+          if (errno == EINTR) goto ExitCommunicate;  // in case program is exiting
       m->Message(m->FATAL, "Error with select() (%s)", strerror(errno));
         }

fact/BIASctrl/History.txt

@@ -12 +12 @@
                         Added 'crate' command. Changed signaling of program exit.
 3/6/2011        Fixed bug in channel addressing from board numbers above 7.
+28/6/2011       Adapted for compilation under ubuntu

fact/BIASctrl/Makefile

@@ -6 +6 @@
 
 CPPFLAGS = -O3 -Wall $(INCDIRS)
-LDLIBS = -L/usr/lib/termcap -lstdc++ -lpthread -lfl -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
+LDLIBS = -L/usr/lib/termcap -lstdc++ -lpthread -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
 
 BIASctrl: $(OBJECTS)

fact/BIASctrl/User.cc

@@ -114 +114 @@
   // Shell command
   if(Command[0]=='.') {
-    system(Command.c_str()+1);
+    if (system(Command.c_str()+1) == 1) {
+          PrintMessage("Error with system() call\n");
+        }
     return;
   }
@@ -620 +622 @@
 bool User::ConvertToRange(string String, struct User::Range &R) {
 
-  int N, M;
+  int N=0, M=0; // Init to avoid compiler warning
 
   // Full range