Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed string literal to char* warning on c++ compilers #14

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions smaz.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <string.h>

/* Our compression codebook, used for compression */
static char *Smaz_cb[241] = {
static const char *Smaz_cb[241] = {
"\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS",
"\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277",
"\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336",
Expand Down Expand Up @@ -52,7 +52,7 @@ static char *Smaz_cb[241] = {
};

/* Reverse compression codebook, used for decompression */
static char *Smaz_rcb[254] = {
static const char *Smaz_rcb[254] = {
" ", "the", "e", "t", "a", "of", "o", "and", "i", "n", "s", "e ", "r", " th",
" t", "in", "he", "th", "h", "he ", "to", "\r\n", "l", "s ", "d", " a", "an",
"er", "c", " o", "d ", "on", " of", "re", "of ", "t ", ", ", "is", "u", "at",
Expand All @@ -76,15 +76,15 @@ static char *Smaz_rcb[254] = {
"e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com"
};

int smaz_compress(char *in, int inlen, char *out, int outlen) {
int smaz_compress(const char *in, int inlen, char *out, int outlen) {
unsigned int h1,h2,h3=0;
int verblen = 0, _outlen = outlen;
char verb[256], *_out = out;

while(inlen) {
int j = 7, needed;
char *flush = NULL;
char *slot;
const char *slot;

h1 = h2 = in[0]<<3;
if (inlen > 1) h2 += in[1];
Expand Down Expand Up @@ -179,7 +179,7 @@ int smaz_decompress(char *in, int inlen, char *out, int outlen) {
inlen -= 2+len;
} else {
/* Codebook entry */
char *s = Smaz_rcb[*c];
const char *s = Smaz_rcb[*c];
int len = strlen(s);

if (outlen < len) return _outlen+1;
Expand Down
2 changes: 1 addition & 1 deletion smaz.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _SMAZ_H
#define _SMAZ_H

int smaz_compress(char *in, int inlen, char *out, int outlen);
int smaz_compress(const char *in, int inlen, char *out, int outlen);
int smaz_decompress(char *in, int inlen, char *out, int outlen);

#endif
2 changes: 1 addition & 1 deletion smaz_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main(void) {
int comprlen, decomprlen;
int j, ranlen;
int times = 1000000;
char *strings[] = {
const char *strings[] = {
"This is a small string",
"foobar",
"the end",
Expand Down