Attachment 61759 Details for Bug 92488 – file.diff

[patch] file.diff

file.diff (text/plain), 2.12 KB, created by Aluminium Oxide on 2006-01-29 05:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aluminium Oxide

Created: 2006-01-29 05:00:12 UTC

Size: 2.12 KB

patch

obsolete

>--- res_debug.c.org	Sun Jan 29 14:59:22 2006
>+++ res_debug.c	Sun Jan 29 14:59:38 2006
>@@ -571,8 +571,8 @@
> 
> /* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
> static u_int8_t
>-precsize_aton(strptr)
>-	char **strptr;
>+precsize_aton(char **strptr)
>+/*	char **strptr; */
> {
> 	unsigned int mval = 0, cmval = 0;
> 	u_int8_t retval = 0;
>@@ -613,15 +613,15 @@
> 
> /* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
> static u_int32_t
>-latlon2ul(latlonstrptr,which)
>-	char **latlonstrptr;
>-	int *which;
>+latlon2ul(char *latlonstrptr,int *which)
>+/*	char **latlonstrptr; */
>+/*	int *which; */
> {
> 	char *cp;
> 	u_int32_t retval;
> 	int deg = 0, min = 0, secs = 0, secsfrac = 0;
> 
>-	cp = *latlonstrptr;
>+	cp = latlonstrptr;
> 
> 	while (isdigit((unsigned char)*cp))
> 		deg = deg * 10 + (*cp++ - '0');
>@@ -704,7 +704,7 @@
> 	while (isspace((unsigned char)*cp))    /* move to next field */
> 		cp++;
> 
>-	*latlonstrptr = cp;
>+	latlonstrptr = cp;
> 
> 	return (retval);
> }
>@@ -716,7 +716,8 @@
> 	const char *ascii;
> 	u_char *binary;
> {
>-	const char *cp, *maxcp;
>+	char *cp;
>+	char *maxcp;
> 	u_char *bcp;
> 
> 	u_int32_t latit = 0, longit = 0, alt = 0;
>@@ -725,21 +726,22 @@
> 	u_int8_t hp = 0x16;	/* default = 1e6 cm = 10000.00m = 10km */
> 	u_int8_t vp = 0x13;	/* default = 1e3 cm = 10.00m */
> 	u_int8_t siz = 0x12;	/* default = 1e2 cm = 1.00m */
>-	int which1 = 0, which2 = 0;
>+	int *which1 = 0, *which2 = 0;
> 
>-	cp = ascii;
>-	maxcp = cp + strlen(ascii);
>+	*cp = *ascii;
>+	*maxcp = *cp + strlen(ascii);
> 
>-	lltemp1 = latlon2ul(&cp, &which1);
>+	lltemp1 = latlon2ul(cp, which1);
> 
>-	lltemp2 = latlon2ul(&cp, &which2);
>+	lltemp2 = latlon2ul(cp, which2);
> 
>-	switch (which1 + which2) {
>+	switch (*which1 + *which2) {
> 	case 3:			/* 1 + 2, the only valid combination */
>-		if ((which1 == 1) && (which2 == 2)) { /* normal case */
>+		if ((*which1 == 1) && (*which2 == 2)) { /* normal case */
> 			latit = lltemp1;
> 			longit = lltemp2;
>-		} else if ((which1 == 2) && (which2 == 1)) { /* reversed */
>+		} else if ((*which1 == 2) && (*which2 == 1)) { /* reversed 
>+*/
> 			longit = lltemp1;
> 			latit = lltemp2;
> 		} else {	/* some kind of brokenness */

Actions: View | Diff

Attachments on bug 92488: 61759