[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

fixlets and exposing a function for use in datapush


  M +1 -1      getdata.c   1.7
  M +8 -3      getdata_cpp.h   1.4


--- kdeextragear-2/kst/kst/getdata.c  #1.6:1.7
@@ -288,5 +288,5 @@ static int BitCmp(const void *A, const v
 /*                                                                         */
 /***************************************************************************/
-static struct FormatType *GetFormat(char *filedir, int *error_code) {
+struct FormatType *GetFormat(const char *filedir, int *error_code) {
   int i_format;
   FILE *fp;

--- kdeextragear-2/kst/kst/getdata_cpp.h  #1.3:1.4
@@ -17,4 +17,5 @@ extern char *GD_ERROR_CODES[15];
 #define GD_E_RECURSE_LEVEL    14
 
+extern "C" {
 /***************************************************************************/
 /*                                                                         */
@@ -36,5 +37,5 @@ extern char *GD_ERROR_CODES[15];
 /*                                                                         */
 /***************************************************************************/
-extern "C" int GetData(char *filename_in, const char *field_code,
+int GetData(char *filename_in, const char *field_code,
              int first_sframe, int first_samp,
              int num_sframes, int num_samp,
@@ -47,5 +48,5 @@ extern "C" int GetData(char *filename_in
 /*                                                                         */
 /***************************************************************************/
-extern "C" int GetSamplesPerFrame(char *filename_in, const char *field_name, int *error_code);
+int GetSamplesPerFrame(char *filename_in, const char *field_name, int *error_code);
 
 /***************************************************************************/
@@ -54,6 +55,10 @@ extern "C" int GetSamplesPerFrame(char *
 /*                                                                         */
 /***************************************************************************/
-extern "C" int GetNFrames(char *filename_in, int *error_code, const char *field);
+int GetNFrames(char *filename_in, int *error_code, const char *field);
+
 
+struct FormatType *GetFormat(const char *filedir, int *error_code);
+
+}
 
 #endif