Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions heclib/javaHeclib/src/Hec_zsqueeze.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#include <string.h>
#include <jni.h>
#include "heclib.h"

JNIEXPORT jint JNICALL Java_hec_heclib_util_Heclib_Hec_1squeezeDSS
(JNIEnv *env, jobject obj, jstring j_filename) {

char* filename = (*env)->GetStringUTFChars (env, j_filename, 0);
const char* filename = (*env)->GetStringUTFChars (env, j_filename, 0);
int status = zsqueeze(filename);
(*env)->ReleaseStringUTFChars (env, j_filename, filename);
return status;
Expand Down
Binary file added lib/x64/zlibstatic.lib
Binary file not shown.
126 changes: 63 additions & 63 deletions test/Dss-C/source/testLargeCopy.c
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
#include <heclib.h>
#include <stdlib.h>
#include <memory.h>
#ifdef _MSC_VER
#include <io.h>
#define F_OK 0
#define access _access
#define COPY_CMD "copy"
#else
#include <unistd.h>
#define COPY_CMD "cp"
#endif
int exists(const char* fname) {
return access(fname, F_OK) == 0;
}
int testLargeCopy() {
int status;
long long ifltab[2][250];
const char *src_filename6 = "large-record-src6.dss";
const char *src_filename7 = "large-record-src7.dss";
const char *dst_filename6 = "large-record-dst6.dss";
const char *dst_filename7 = "large-record-dst7.dss";
const char *src_filename = NULL;
const char *dst_filename = NULL;
for (int src_ver = 7; src_ver <= 7; ++src_ver) {
for (int dst_ver = 7; dst_ver <= 7; ++dst_ver) {
if (src_ver == 7 && dst_ver == 6) {
char command[500];
sprintf(command, "%s %s %s", COPY_CMD, dst_filename7, src_filename7);
system(command);
}
src_filename = src_ver == 6 ? src_filename6 : src_filename7;
dst_filename = dst_ver == 6 ? dst_filename6 : dst_filename7;
if (!exists(src_filename)) {
printf("No such file: %s\n", src_filename);
return 1;
}
if (exists(dst_filename)) {
remove(dst_filename);
}
memset(ifltab, 0, sizeof(ifltab));
status = hec_dss_zopen(ifltab[0], src_filename);
assert(status == 0);
status = hec_dss_zopen(ifltab[1], dst_filename);
assert(status == 0);
status = zcopyFile(ifltab[0], ifltab[1], REC_STATUS_VALID);
zclose(ifltab[0]);
zclose(ifltab[1]);
if (status != 0) {
break;
}
}
}
return status;
#include <heclib.h>
#include <stdlib.h>
#include <memory.h>

#ifdef _MSC_VER
#include <io.h>
#define F_OK 0
#define access _access
#define COPY_CMD "copy"
#else
#include <unistd.h>
#define COPY_CMD "cp"
#endif

int exists(const char* fname) {
return access(fname, F_OK) == 0;
}

int testLargeCopy() {
int status;
long long ifltab[2][250];
const char *src_filename6 = "large-record-src6.dss";
const char *src_filename7 = "large-record-src7.dss";
const char *dst_filename6 = "large-record-dst6.dss";
const char *dst_filename7 = "large-record-dst7.dss";
const char *src_filename = NULL;
const char *dst_filename = NULL;

for (int src_ver = 7; src_ver <= 7; ++src_ver) {
for (int dst_ver = 7; dst_ver <= 7; ++dst_ver) {
if (src_ver == 7 && dst_ver == 6) {
char command[500];
sprintf(command, "%s %s %s", COPY_CMD, dst_filename7, src_filename7);
system(command);
}
src_filename = src_ver == 6 ? src_filename6 : src_filename7;
dst_filename = dst_ver == 6 ? dst_filename6 : dst_filename7;
if (!exists(src_filename)) {
printf("No such file: %s\n", src_filename);
return 1;
}
if (exists(dst_filename)) {
remove(dst_filename);
}
memset(ifltab, 0, sizeof(ifltab));

status = hec_dss_zopen(ifltab[0], src_filename);

assert(status == 0);

status = hec_dss_zopen(ifltab[1], dst_filename);

assert(status == 0);

status = zcopyFile(ifltab[0], ifltab[1], REC_STATUS_VALID);
zclose(ifltab[0]);
zclose(ifltab[1]);
if (status != 0) {
break;
}
}
}
return status;
}
Loading
Loading