help/options.c: add error handling for -d arg

[openocd] / src / helper / fileio.h

diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index f37dbd14b6d02c1f194335d4bf11f2eedabb420f..ae4a3ecfc291b4665e81e920dd82f6d787a118ec 100644 (file)
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -19,25 +19,20 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef FILEIO_H
-#define FILEIO_H
 
-#include <helper/types.h>
+#ifndef OPENOCD_HELPER_FILEIO_H
+#define OPENOCD_HELPER_FILEIO_H
 
 #define FILEIO_MAX_ERROR_STRING                (128)
 
-enum fileio_type
-{
+enum fileio_type {
        FILEIO_TEXT,
        FILEIO_BINARY,
 };
 
-enum fileio_access
-{
+enum fileio_access {
        FILEIO_NONE,            /* open without any access (invalid mode) */
        FILEIO_READ,            /* open for reading, position at beginning */
        FILEIO_WRITE,           /* open for writing, position at beginning */
@@ -46,14 +41,10 @@ enum fileio_access
        FILEIO_APPENDREAD,      /* open for writing, position at end, allow reading */
 };
 
-struct fileio
-{
-       /* The structure is opaque */
-       struct fileio_internal *fp;
-};
+struct fileio;
 
-int fileio_open(struct fileio *fileio,
-       const char *url, enum fileio_access access_type, enum fileio_type type);
+int fileio_open(struct fileio **fileio, const char *url,
+               enum fileio_access access_type, enum fileio_type type);
 int fileio_close(struct fileio *fileio);
 
 int fileio_seek(struct fileio *fileio, size_t position);
@@ -66,13 +57,13 @@ int fileio_write(struct fileio *fileio,
 
 int fileio_read_u32(struct fileio *fileio, uint32_t *data);
 int fileio_write_u32(struct fileio *fileio, uint32_t data);
-int fileio_size(struct fileio *fileio, int *size);
+int fileio_size(struct fileio *fileio, size_t *size);
 
-#define ERROR_FILEIO_LOCATION_UNKNOWN  (-1200)
-#define ERROR_FILEIO_NOT_FOUND                 (-1201)
-#define ERROR_FILEIO_OPERATION_FAILED          (-1202)
-#define ERROR_FILEIO_ACCESS_NOT_SUPPORTED      (-1203)
-#define ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN     (-1204)
+#define ERROR_FILEIO_LOCATION_UNKNOWN                  (-1200)
+#define ERROR_FILEIO_NOT_FOUND                                 (-1201)
+#define ERROR_FILEIO_OPERATION_FAILED                  (-1202)
+#define ERROR_FILEIO_ACCESS_NOT_SUPPORTED              (-1203)
+#define ERROR_FILEIO_RESOURCE_TYPE_UNKNOWN             (-1204)
 #define ERROR_FILEIO_OPERATION_NOT_SUPPORTED   (-1205)
 
-#endif /* FILEIO_H */
+#endif /* OPENOCD_HELPER_FILEIO_H */