phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Update to use stdint/stdbool.h 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@2382 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2009-12-18 15:23:56 +00:00
parent 1d70b60e56
commit 7e64359831
3 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
misc/pascal/libpas/pextension.c
View File

@ -2,7 +2,7 @@
* pextension.c
* Manage file extensions
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* 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
@ -38,6 +38,7 @@
* Included Files
**********************************************************************/
#include <stdbool.h>
#include <string.h>
#include "keywords.h"
@ -46,8 +47,8 @@
/***********************************************************************/
boolean extension(const char *inName, const char *ext, char *outName,
boolean force_default)
bool extension(const char *inName, const char *ext, char *outName,
bool force_default)
{
int namelen = strlen(inName);
int extlen;
@ -69,17 +70,17 @@ boolean extension(const char *inName, const char *ext, char *outName,
*/
if ((namelen + 1) > FNAME_SIZE)
{
/* It won't */
{
/* It won't */
return TRUE;
}
return true;
}
else
{
/* Copy the string. */
{
/* Copy the string. */
strcpy(outName, inName);
}
strcpy(outName, inName);
}
}
else
{
@ -88,44 +89,44 @@ boolean extension(const char *inName, const char *ext, char *outName,
extlen = strlen(ext) + 1; /* extension + null terminator */
if (lastdot != NULL)
{
/* It has an extension. We must copy everything except the
* last dot and the following extension.
*/
{
/* It has an extension. We must copy everything except the
* last dot and the following extension.
*/
copylen = namelen - strlen(lastdot); /* name - . - terminator */
}
copylen = namelen - strlen(lastdot); /* name - . - terminator */
}
else
{
/* It has no extension. We must copy everything */
{
/* It has no extension. We must copy everything */
copylen = namelen + 1; /* whole name with null termination */
}
copylen = namelen + 1; /* whole name with null termination */
}
/* Make sure that the string (with its null terminator) will fit in
* the allocated buffer.
*/
if ((copylen + extlen + 1) > FNAME_SIZE)
{
/* It won't */
{
/* It won't */
return TRUE;
}
return true;
}
else
{
/* It will Copy file name up to, but excluding, the '.' */
{
/* It will Copy file name up to, but excluding, the '.' */
memcpy(outName, inName, copylen);
memcpy(outName, inName, copylen);
/* Then copy the extension */
/* Then copy the extension */
outName[copylen] = '.';
memcpy(&outName[copylen+1], ext, extlen);
}
outName[copylen] = '.';
memcpy(&outName[copylen+1], ext, extlen);
}
}
return FALSE;
return false;
} /* end extension */

10
misc/pascal/libpas/psignextend16.c
View File

@ -2,7 +2,7 @@
* psignextend16.c
* 16-bit sign extension
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* 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
@ -45,13 +45,13 @@
#include "paslib.h"
/***********************************************************************/
/* This function converts a signed 16-bit value represented as a uint16
* to a sint32.
/* This function converts a signed 16-bit value represented as a uint16_t
* to a int32_t.
*/
sint32 signExtend16(uint16 arg16)
int32_t signExtend16(uint16_t arg16)
{
sint32 arg32 = (sint32)arg16 << 16;
int32_t arg32 = (int32_t)arg16 << 16;
return arg32 >> 16;
}

7
misc/pascal/libpas/pswap.c
View File

@ -2,7 +2,7 @@
* libpas/pswap.c
* Byte swapping to handling endian-ness conversions
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* 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
@ -38,6 +38,7 @@
* Included Files
**********************************************************************/
#include <stdint.h>
#include <string.h>
#include "keywords.h"
@ -46,12 +47,12 @@
/***********************************************************************/
uint16 poffSwap16(uint16 val)
uint16_t poffSwap16(uint16_t val)
{
return val >> 8 | val << 8;
}
uint32 poffSwap32(uint32 val)
uint32_t poffSwap32(uint32_t val)
{
return val >> 24 | ((val >> 8) & 0x0000ff00) | ((val << 8) & 0x00ff0000) | val << 24;
}