[Kst] kdeextragear-2/kst/kst [POSSIBLY UNSAFE]

[George Staikos]

CVS commit by staikos: 

- move the data code into the proper plugins
- add the frame plugin, untested and not yet functional by any means


  A            datasources/frame/.cvsignore   1.1
  A            datasources/frame/Makefile.am   1.1
  A            datasources/frame/frame.cpp   1.1 [POSSIBLY UNSAFE: printf] [GPL (v2+)]
  A            datasources/frame/frame.h   1.1 [GPL (v2+)]
  A            datasources/frame/kstdata_frame.desktop   1.1
  M +0 -6      Makefile.am   1.47
  M +1 -1      datasources/Makefile.am   1.3
  M +1 -1      datasources/dirfile/Makefile.am   1.2
  M +2 -2      datasources/dirfile/dirfile.cpp   1.3
  M +1 -1      datasources/frame/creaddata.c   1.6
  M +1 -1      datasources/frame/creaddata.h   1.3
  M +1 -1      datasources/frame/readdata.c   1.7
  M +1 -1      datasources/frame/readdata.h   1.3
  R            creaddata.c   1.5
  R            creaddata.h   1.2
  R            getdata.c   1.11
  R            getdata.h   1.5
  R            getdata_struct.h   1.2
  R            readdata.c   1.6
  R            readdata.h   1.2


--- kdeextragear-2/kst/kst/Makefile.am  #1.46:1.47
@@ -16,7 +16,4 @@
 d2asc_SOURCES = \
         d2asc.cpp \
-        getdata.c \
-        readdata.c \
-        creaddata.c \
         kstdataobject.cpp \
         kstdatacollection.cpp \
@@ -64,7 +61,4 @@
         genterStacks.cpp \
         ksthistogram.cpp \
-        getdata.c \
-        readdata.c \
-        creaddata.c \
         fftsg_h.c \
         scalarselector.ui \

--- kdeextragear-2/kst/kst/datasources/Makefile.am  #1.2:1.3
@@ -1 +1 @@
-SUBDIRS=ascii dirfile
+SUBDIRS=ascii dirfile frame

--- kdeextragear-2/kst/kst/datasources/dirfile/Makefile.am  #1.1:1.2
@@ -4,5 +4,5 @@
 
 kstdata_dirfile_la_LDFLAGS=$(all_libraries) -module -avoid-version
-kstdata_dirfile_la_SOURCES=dirfile.cpp
+kstdata_dirfile_la_SOURCES=dirfile.cpp getdata.c
 
 METASOURCES=AUTO

--- kdeextragear-2/kst/kst/datasources/dirfile/dirfile.cpp  #1.2:1.3
@@ -17,6 +17,6 @@
 
 #include "dirfile.h"
-#include <getdata.h>
-#include <getdata_struct.h>
+#include "getdata.h"
+#include "getdata_struct.h"
 
  

--- kdeextragear-2/kst/kst/datasources/frame/creaddata.c  #1.5:1.6
@@ -827,5 +827,5 @@ static void FTypeCopy(void *data_out, ch
 /*                                                                         */
 /***************************************************************************/
-int CReadData(char *filename_in, char *field_code,
+int CReadData(const char *filename_in, const char *field_code,
              int first_sframe, int first_samp,
              int num_sframes, int num_samp,

--- kdeextragear-2/kst/kst/datasources/frame/creaddata.h  #1.2:1.3
@@ -38,5 +38,5 @@
 extern const char *const CRD_ERROR_CODES[15];
 
-int CReadData(char *filename, char *field_code,
+int CReadData(const char *filename, const char *field_code,
              int first_sframe, int first_samp,
              int num_sframes, int num_samp,

--- kdeextragear-2/kst/kst/datasources/frame/readdata.c  #1.6:1.7
@@ -771,5 +771,5 @@ static int RD_ConvertType(unsigned char 
 /*                                                                         */
 /***************************************************************************/
-int ReadData(char *filename_in, char *field_code,
+int ReadData(const char *filename_in, const char *field_code,
              int first_sframe, int first_samp,
              int num_sframes, int num_samp,

--- kdeextragear-2/kst/kst/datasources/frame/readdata.h  #1.2:1.3
@@ -23,5 +23,5 @@
 extern const char *const RD_ERROR_CODES[7];
 
-int ReadData(char *filename, char *field_code,
+int ReadData(const char *filename, const char *field_code,
              int first_sframe, int first_samp,
              int num_sframes, int num_samp,