Code cleanup: remove readblenfile module, only contained some utility functions

to read .blend files from runtimes, folded those into blenloader.

6 files changed, 0 insertions, 457 deletions

diff --git a/source/blender/readblenfile/BLO_readblenfile.h b/source/blender/readblenfile/BLO_readblenfile.h
deleted file mode 100644
index 9b4e15165f5..00000000000
--- a/source/blender/readblenfile/BLO_readblenfile.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- * 
- */
-
-#ifndef BLO_READBLENFILE_H
-#define BLO_READBLENFILE_H
-
-/** \file BLO_readblenfile.h
- *  \ingroup blo
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ReportList;
-
-	BlendFileData *
-BLO_readblenfilename(
-	char *fileName, 
-	struct ReportList *reports);
-
-	BlendFileData *
-BLO_readblenfilehandle(
-	int fileHandle, 
-	struct ReportList *reports);
-
-	BlendFileData *
-BLO_readblenfilememory(
-	char *fromBuffer,
-	int fromBufferSize, 
-	struct ReportList *reports);
-
-
-	void
-BLO_setcurrentversionnumber(
-	char array[4]);
-
-	void
-BLO_setversionnumber(
-	char array[4],
-	int version);
-
-	int
-blo_is_a_runtime(
-	char *file);
-
-	BlendFileData *
-blo_read_runtime(
-	char *file, 
-	struct ReportList *reports);
-
-#define BLO_RESERVEDSIZE 12
-extern const char *headerMagic;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BLO_READBLENFILE_H */
-
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt
deleted file mode 100644
index 9b869d39697..00000000000
--- a/source/blender/readblenfile/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC 
-	.
-	../blenloader
-	../blenloader/intern
-	../blenkernel
-	../blenlib
-	../makesdna
-)
-
-set(SRC
-	intern/BLO_readblenfile.c
-
-	BLO_readblenfile.h
-)
-
-blender_add_lib(bf_readblenfile "${SRC}" "${INC}")
diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript
deleted file mode 100644
index 07f84eb52d5..00000000000
--- a/source/blender/readblenfile/SConscript
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/python
-Import ('env')
-
-sources = env.Glob('intern/*.c')
-
-incs = '.  ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna'
-
-env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['core','player'], priority = [0,5] )
diff --git a/source/blender/readblenfile/intern/BLO_readblenfile.c b/source/blender/readblenfile/intern/BLO_readblenfile.c
deleted file mode 100644
index 351de4bd215..00000000000
--- a/source/blender/readblenfile/intern/BLO_readblenfile.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- */
-/**
- * \file BLO_readblenfile.c
- * \brief This file handles the loading if .blend files
- * \ingroup blo
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#ifdef WIN32
-#include <io.h>		// read, open
-#include "BLI_winstuff.h"
-#else // ! WIN32
-#include <unistd.h>		// read
-#endif
-
-#include "BLO_readfile.h"
-#include "BLO_readblenfile.h"
-
-#include "BKE_blender.h"
-#include "BKE_report.h"
-
-#include "BLI_blenlib.h"
-
-/** Magic number for the file header */
-const char *headerMagic = "BLENDFI";
-
-/**
- * \brief Set the version number into the array.
- *
- * version contains the integer number of the version
- * i.e. 227
- * array[1] gets set to the div of the number by 100 i.e. 2
- * array[2] gets the remainder i.e. 27
- */
-void BLO_setversionnumber(char array[4], int version)
-{
-	memset(array, 0, sizeof(char)*4);
-
-	array[1] = version / 100;
-	array[2] = version % 100;
-}
-
-/**
- * Sets version number using BLENDER_VERSION
- * Function that calls the setversionnumber(char[],int) with 
- * the BLENDER_VERSION constant and sets the resultant array
- * with the version parts.  
- * see BLO_setversionnumber(char[],int).
- */
-void BLO_setcurrentversionnumber(char array[4])
-{
-	BLO_setversionnumber(array, BLENDER_VERSION);
-}
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-/* Runtime reading */
-
-static int handle_read_msb_int(int handle) {
-	unsigned char buf[4];
-
-	if (read(handle, buf, 4)!=4)
-		return -1;
-	else
-		return (buf[0]<<24) + (buf[1]<<16) + (buf[2]<<8) + (buf[3]<<0);
-}
-
-int blo_is_a_runtime(char *path) {
-	int res= 0, fd= open(path, O_BINARY|O_RDONLY, 0);
-	int datastart;
-	char buf[8];
-
-	if (fd==-1)
-		goto cleanup;
-	
-	lseek(fd, -12, SEEK_END);
-	
-	datastart= handle_read_msb_int(fd);
-	if (datastart==-1)
-		goto cleanup;
-	else if (read(fd, buf, 8)!=8)
-		goto cleanup;
-	else if (memcmp(buf, "BRUNTIME", 8)!=0)
-		goto cleanup;
-	else
-		res= 1;
-
-cleanup:
-	if (fd!=-1)
-		close(fd);
-
-	return res;	
-}
-
-BlendFileData *
-blo_read_runtime(
-	char *path, 
-	ReportList *reports)
-{
-	BlendFileData *bfd= NULL;
-	size_t actualsize;
-	int fd, datastart;
-	char buf[8];
-
-	fd= open(path, O_BINARY|O_RDONLY, 0);
-	if (fd==-1) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to open \"%s\": %s.", path, strerror(errno));
-		goto cleanup;
-	}
-	
-	actualsize= BLI_filesize(fd);
-
-	lseek(fd, -12, SEEK_END);
-
-	datastart= handle_read_msb_int(fd);
-	if (datastart==-1) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (problem seeking)", path);
-		goto cleanup;
-	} else if (read(fd, buf, 8)!=8) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (truncated header)", path);
-		goto cleanup;
-	} else if (memcmp(buf, "BRUNTIME", 8)!=0) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to read  \"%s\" (not a blend file)", path);
-		goto cleanup;
-	} else {	
-		//printf("starting to read runtime from %s at datastart %d\n", path, datastart);
-		lseek(fd, datastart, SEEK_SET);
-		bfd = blo_read_blendafterruntime(fd, path, actualsize-datastart, reports);
-		fd= -1;	// file was closed in blo_read_blendafterruntime()
-	}
-	
-cleanup:
-	if (fd!=-1)
-		close(fd);
-	
-	return bfd;
-}
-
diff --git a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c b/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
deleted file mode 100644
index 0f3541b510d..00000000000
--- a/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- */
-
-/** \file blender/readblenfile/stub/BLO_readblenfileSTUB.c
- *  \ingroup blo
- */
-
-
-#include <stdio.h>
-
-int BLO_readblenfilememory( char *fromBuffer, int fromBufferSize);
-int BLO_readblenfilename( char *fileName);
-int BLO_readblenfilehandle( int fileHandle);
-int BLO_is_a_runtime( char *file);
-int BLO_read_runtime( char *file);
-
-	int
-BLO_readblenfilememory(
-	char *fromBuffer, int fromBufferSize)
-{
-#if defined(DEBUG)
-	fprintf(stderr,
-			"Error BLO_readblenfilename is a stub\n");
-#endif
-	return(1);
-}
-
-	int
-BLO_readblenfilename(
-	char *fileName)
-{
-#if defined(DEBUG)
-	fprintf(stderr,
-			"Error BLO_readblenfilename is a stub\n");
-#endif
-	return(1);
-}
-
-	int
-BLO_readblenfilehandle(
-	int fileHandle)
-{
-#if defined(DEBUG)
-	fprintf(stderr,
-			"Error BLO_readblenfilehandle is a stub\n");
-#endif
-	return(1);
-}
-
-	int
-BLO_is_a_runtime(
-	char *file)
-{
-#if defined(DEBUG)
-	fprintf(stderr,
-			"Error BLO_is_a_runtime is a stub\n");
-#endif
-	return 0;
-}
-
-	int
-BLO_read_runtime(
-	char *file) 
-{
-#if defined(DEBUG)
-	fprintf(stderr,
-			"Error BLO_read_runtime is a stub\n");
-#endif
-	return 0;
-}
diff --git a/source/blender/readblenfile/test/test.c b/source/blender/readblenfile/test/test.c
deleted file mode 100644
index 647df053c38..00000000000
--- a/source/blender/readblenfile/test/test.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#include <string.h>    // strlen
-#include "BLO_readblenfile.h"
-
-struct streamGlueControlStruct *Global_streamGlueControl;
-
-		int
-streamGlueWrite(
-		struct streamGlueControlStruct *streamGlueControl,
-		struct streamGlueStruct **streamGlue,
-		unsigned char *data,
-		unsigned int dataIn,
-		int finishUp)
-{
-	printf("called with %d bytes in buffer [%s]\n", dataIn, data);
-	return (0);
-}
-
-main()
-{
-	int err;
-
-	err = BLO_readblenfile();
-}