github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

conversion fixes

Browse source
This commit is contained in:
iceman1001 2021-04-16 22:30:53 +02:00
commit 2d5aaaa335
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
armsrc/string.c
View file

@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t len) {
return dest; return dest;
} }
void *memset(void *dest, int c, int len) { void *memset(void *dest, uint8_t c, int len) {
uint8_t *d = dest; uint8_t *d = dest;
while ((len--) > 0) { while ((len--) > 0) {
*d = c; *d = c;
@ -70,18 +70,19 @@ int strlen(const char *str) {
} }
char *strncat(char *dest, const char *src, unsigned int n) { char *strncat(char *dest, const char *src, unsigned int n) {
unsigned int dest_len = strlen(dest); int dest_len = strlen(dest);
unsigned int i; unsigned int i;
for (i = 0 ; i < n && src[i] != '\0' ; i++) for (i = 0 ; i < n && src[i] != '\0' ; i++)
dest[dest_len + i] = src[i]; dest[dest_len + i] = src[i];
dest[dest_len + i] = '\0'; dest[dest_len + i] = '\0';
return dest; return dest;
} }
char *strcat(char *dest, const char *src) { char *strcat(char *dest, const char *src) {
unsigned int dest_len = strlen(dest); int dest_len = strlen(dest);
unsigned int i; unsigned int i;
for (i = 0 ; src[i] != '\0' ; i++) for (i = 0 ; src[i] != '\0' ; i++)
@ -97,7 +98,7 @@ void strreverse(char s[]) {
int j = strlen(s) - 1; int j = strlen(s) - 1;
for (int i = 0; i < j; i++, j--) { for (int i = 0; i < j; i++, j--) {
int c = s[i]; char c = s[i];
s[i] = s[j]; s[i] = s[j];
s[j] = c; s[j] = c;
} }
@ -105,11 +106,11 @@ void strreverse(char s[]) {
/* itoa: convert n to characters in s */ /* itoa: convert n to characters in s */
void itoa(int n, char s[]) { void itoa(int n, char s[]) {
int i, sign; int sign;
if ((sign = n) < 0) /* record sign */ if ((sign = n) < 0) /* record sign */
n = -n; /* make n positive */ n = -n; /* make n positive */
i = 0;
int i = 0;
do { /* generate digits in reverse order */ do { /* generate digits in reverse order */
s[i++] = n % 10 + '0'; /* get next digit */ s[i++] = n % 10 + '0'; /* get next digit */
} while ((n /= 10) > 0); /* delete it */ } while ((n /= 10) > 0); /* delete it */

2
armsrc/string.h
View file

@ -17,7 +17,7 @@
int strlen(const char *str); int strlen(const char *str);
void *memcpy(void *dest, const void *src, int len); void *memcpy(void *dest, const void *src, int len);
void *memmove(void *dest, const void *src, size_t len); void *memmove(void *dest, const void *src, size_t len);
void *memset(void *dest, int c, int len); void *memset(void *dest, uint8_t c, int len);
int memcmp(const void *av, const void *bv, int len); int memcmp(const void *av, const void *bv, int len);
void memxor(uint8_t *dest, uint8_t *src, size_t len); void memxor(uint8_t *dest, uint8_t *src, size_t len);
char *strncat(char *dest, const char *src, unsigned int n); char *strncat(char *dest, const char *src, unsigned int n);