diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-18 16:48:14 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-18 16:48:14 +0000 |
commit | 789701194f4dcd57c9bb82b1ae0aa262ea9fc389 (patch) | |
tree | 2d80118a7fa6798d7cd110c057609815f5a13d5e /misc/pascal/libpoff/pfirodata.c | |
parent | 9695e5c9051d331278288a071c1353ae7214c4c2 (diff) | |
download | nuttx-789701194f4dcd57c9bb82b1ae0aa262ea9fc389.tar.gz nuttx-789701194f4dcd57c9bb82b1ae0aa262ea9fc389.tar.bz2 nuttx-789701194f4dcd57c9bb82b1ae0aa262ea9fc389.zip |
Update to use stdint/stdbool.h
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2385 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'misc/pascal/libpoff/pfirodata.c')
-rw-r--r-- | misc/pascal/libpoff/pfirodata.c | 205 |
1 files changed, 103 insertions, 102 deletions
diff --git a/misc/pascal/libpoff/pfirodata.c b/misc/pascal/libpoff/pfirodata.c index 2d4679ada..35e65268f 100644 --- a/misc/pascal/libpoff/pfirodata.c +++ b/misc/pascal/libpoff/pfirodata.c @@ -1,102 +1,103 @@ -/**********************************************************************
- * pfirodata.c
- * Append program read-only data to a POFF file
- *
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- **********************************************************************/
-
-/**********************************************************************
- * Included Files
- **********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include "keywords.h" /* Standard types */
-#include "pedefs.h" /* error code definitions */
-
-#include "perr.h" /* error() */
-#include "pofflib.h" /* POFF library interface */
-#include "pfprivate.h" /* POFF private definitions */
-
-/**********************************************************************
- * Definitions
- **********************************************************************/
-
-/**********************************************************************
- * Global Variables
- **********************************************************************/
-
-/**********************************************************************
- * Private Variables
- **********************************************************************/
-
-/***********************************************************************
- * Private Function Prototypes
- ***********************************************************************/
-
-/***********************************************************************
- * Private Functions
- ***********************************************************************/
-
-/***********************************************************************/
-
-void poffAppendRoData(poffHandle_t handle,
- ubyte *roData, uint32 roDataSize)
-{
- poffInfo_t *poffInfo = (poffInfo_t*)handle;
- ubyte *tmp;
- uint32 newSize;
-
- if ((roData) && (roDataSize))
- {
- /* Reallocate the read-only data */
-
- newSize = poffInfo->roDataSection.sh_size + roDataSize;
- tmp = (ubyte*)realloc(poffInfo->roDataSectionData, newSize);
- if (!tmp) fatal(eNOMEMORY);
-
- /* Add the new data to the new allocation */
-
- memcpy(&tmp[poffInfo->roDataSection.sh_size], roData, roDataSize);
-
- /* Add the new allocation to the read-only section */
-
- poffInfo->roDataSection.sh_size = newSize;
- poffInfo->roDataSectionData = tmp;
- poffInfo->roDataSectionAlloc = newSize;
- }
-}
-
-/***********************************************************************/
+/********************************************************************** + * pfirodata.c + * Append program read-only data to a POFF file + * + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + **********************************************************************/ + +/********************************************************************** + * Included Files + **********************************************************************/ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> + +#include "keywords.h" /* Standard types */ +#include "pedefs.h" /* error code definitions */ + +#include "perr.h" /* error() */ +#include "pofflib.h" /* POFF library interface */ +#include "pfprivate.h" /* POFF private definitions */ + +/********************************************************************** + * Definitions + **********************************************************************/ + +/********************************************************************** + * Global Variables + **********************************************************************/ + +/********************************************************************** + * Private Variables + **********************************************************************/ + +/*********************************************************************** + * Private Function Prototypes + ***********************************************************************/ + +/*********************************************************************** + * Private Functions + ***********************************************************************/ + +/***********************************************************************/ + +void poffAppendRoData(poffHandle_t handle, + uint8_t *roData, uint32_t roDataSize) +{ + poffInfo_t *poffInfo = (poffInfo_t*)handle; + uint8_t *tmp; + uint32_t newSize; + + if ((roData) && (roDataSize)) + { + /* Reallocate the read-only data */ + + newSize = poffInfo->roDataSection.sh_size + roDataSize; + tmp = (uint8_t*)realloc(poffInfo->roDataSectionData, newSize); + if (!tmp) fatal(eNOMEMORY); + + /* Add the new data to the new allocation */ + + memcpy(&tmp[poffInfo->roDataSection.sh_size], roData, roDataSize); + + /* Add the new allocation to the read-only section */ + + poffInfo->roDataSection.sh_size = newSize; + poffInfo->roDataSectionData = tmp; + poffInfo->roDataSectionAlloc = newSize; + } +} + +/***********************************************************************/ |