Changeset 104 for trunk/examples/c-example

Timestamp:

Oct 14, 2005 9:43:27 AM (19 years ago)

Author:

dkearney

Message:

This update brings us one step closer to being const correct in the RpUnits
class. Added a few more comments. All other files touched were made to
comply with the new const correct RpUnits.[h,cc]

Location:

trunk/examples/c-example

Files:

• Makefile (modified) (2 diffs)
• plotc.c (modified) (5 diffs)

trunk/examples/c-example/Makefile

@@ -18 +18 @@
 INCL_RP_DEPS    = -I $(RP_BASE)/include
 
+INCL_FILES      = $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS)
+
 LIB_DIR         = $(RP_BASE)/lib
 LIB_INC_PREFIX  = -Wl,-rpath,$(LIB_DIR) -L$(LIB_DIR)
@@ -25 +27 @@
 
 plot: plot.cc
-        $(CXX) $(DEBUG) -DDEBUG $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $< $(LIB_RAPPTURE)
+        $(CXX) $(DEBUG) -DDEBUG $(INCL_FILES) -o $@ $< $(LIB_RAPPTURE)
 
 plotc: plotc.c
-        $(CC) $(DEBUG) -DDEBUG $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $< $(LIB_RAPPTURE)
+        $(CC) $(DEBUG) -DDEBUG $(INCL_FILES) -o $@ $< $(LIB_RAPPTURE) -lm
 
 #### CLEAN UP ############################################################

trunk/examples/c-example/plotc.c

@@ -1 +1 @@
 #include "RpLibraryCInterface.h"
 
-//#include <stdlib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <math.h>
 
 int main(int argc, char * argv[])
@@ -10 +11 @@
     RpLibrary* lib = NULL;
 
-    char* filePath;
-    char* xmltext = NULL;
+    const char* filePath;
+    const char* xmltext = NULL;
     double fmin, fmax;
     char strFormula[100];
@@ -42 +43 @@
         // cannot open file or out of memory
         printf("FAILED creating Rappture Library\n");
-        exit(1);
+        return(1);
     }
 
@@ -54 +55 @@
     else {
         printf("xml(lib) failed\n");
-        exit(1);
+        return(1);
     }
 
@@ -62 +63 @@
     if (! (xmltext) ) {
         printf("getString(lib,input.number(xmin).current) returns null\n");
-        exit(1);
+        return(1);
     }