head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.100
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.98
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.96
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.94
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.92
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.90
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.88
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.86
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.84
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.82
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.80
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.78
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.76
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.74
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.72
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.70
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.68
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.66
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.64
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.62
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.60
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.58
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.56
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.52
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.32
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.54
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.50
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.48
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.46
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.44
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.42
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.40
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.38
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.36
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.34
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.30
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.28
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.26
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.24
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.22
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.20
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.18
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.16
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.14
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.12
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.10
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.8
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.6
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.4
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2013.12.06.21.26.05;	author joerg;	state Exp;
branches;
next	;
commitid	wpZytHrNEsL2n7gx;


desc
@@


1.1
log
@Don't use void * arithmetic. Fix some const issues.
@
text
@$NetBSD$

--- src/smaSHeM.cpp.orig	2013-11-29 12:09:30.000000000 +0000
+++ src/smaSHeM.cpp
@@@@ -22,7 +22,7 @@@@ Foundation, Inc., 51 Franklin St, Fifth 
 
 #include "smaSHeM.h"
 
-void usage(char *commandname) {
+void usage(const char *commandname) {
 	if (commandname != (char *) NULL) {
 		fprintf(stderr, "usage: %s -v | -i <shmemid> -l <shmemlength> <-@@ <patchoffset> -s <patchstring> | -d [-p | -c | -P | -j -x <xstart> -X <endx> -y <starty> -Y <yend>]>\n", commandname);
 	} else {
@@@@ -31,7 +31,7 @@@@ void usage(char *commandname) {
 	exit(EXIT_FAILURE);
 }
 
-void error(char *commandname, char *errorstring) {
+void error(const char *commandname, const char *errorstring) {
 	if (errno) {
 		if (errorstring != (char *) NULL) {
 			perror(errorstring);
@@@@ -164,7 +164,7 @@@@ int main(int argc, char **argv) {
 						if ((shmembuffer = (void *) shmat(shmemid, (void *) NULL, SHM_RND)) != (void *) -1) {
 							if (patchstring != (char *) NULL) {
 								for (patchcounter = 0; patchcounter < strlen(patchstring); patchcounter ++) {
-									*((char *) (shmembuffer + patchoffset + patchcounter)) = *(patchstring + patchcounter);
+									*((char *)shmembuffer + patchoffset + patchcounter) = *(patchstring + patchcounter);
 								}
 							}
 							shmdt(shmembuffer);
@@@@ -181,32 +181,32 @@@@ int main(int argc, char **argv) {
 								if (jpegflag != TRUE) {
 									for (displaycounter = 0; displaycounter < shmemlength; displaycounter ++) {
 										if (perlflag == TRUE) {
-											printf("\\x%02x", (unsigned char) *((char *) (shmembuffer + displaycounter)));
+											printf("\\x%02x", (unsigned char) *((char *)shmembuffer + displaycounter));
 										} else {
 											if (cflag == TRUE) {
-												printf("0x%02x", (unsigned char) *((char *) (shmembuffer + displaycounter)));
+												printf("0x%02x", (unsigned char) *((char *)shmembuffer + displaycounter));
 												if ((displaycounter + 1) < shmemlength) {
 													printf(",");
 												}
 											} else {
 												if (prettyflag == TRUE) {
 													if ((displaycounter % PRETTYLINELENGTH) == 0) {
-														printf("0x%08x\t", shmembuffer + displaycounter);
+														printf("0x%08x\t", (char *)shmembuffer + displaycounter);
 													}
 													if ((displaycounter % PRETTYLINELENGTH) > 0) {
 														printf(" ");
 													}
-													if (isalnum((unsigned char) *((char *) (shmembuffer + displaycounter)))) {
-														prettybuffer[displaycounter % PRETTYLINELENGTH] = (unsigned char) *((char *) (shmembuffer + displaycounter));
+													if (isalnum((unsigned char) *((char *)shmembuffer + displaycounter))) {
+														prettybuffer[displaycounter % PRETTYLINELENGTH] = (unsigned char) *((char *)shmembuffer + displaycounter);
 													} else {
 														prettybuffer[displaycounter % PRETTYLINELENGTH] = (unsigned char) '.';
 													}
-													printf("%02x", (unsigned char) *((char *) (shmembuffer + displaycounter)));
+													printf("%02x", (unsigned char) *((char *)shmembuffer + displaycounter));
 													if ((displaycounter % PRETTYLINELENGTH) == (PRETTYLINELENGTH - 1)) {
 														printf("\t%s\n", prettybuffer);
 													}
 												} else {
-													printf("%c", (unsigned char) *((char *) (shmembuffer + displaycounter)));
+													printf("%c", (unsigned char) *((char *)shmembuffer + displaycounter));
 												}
 											}
 										}
@