Browse Source

CMake: Update warnings and compile flags.

master
Jari Vetoniemi 10 years ago
parent
commit
29bdbd9947
5 changed files with 22 additions and 16 deletions
  1. +9
    -3
      CMakeLists.txt
  2. +2
    -2
      bin/server.c
  3. +1
    -1
      lib/chck
  4. +9
    -9
      src/pi9.c
  5. +1
    -1
      src/pi9.h

+ 9
- 3
CMakeLists.txt View File

@ -11,8 +11,14 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-variadic-macros -Wno-long-long")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-variadic-macros -Wno-long-long")
set(ldflags -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ldflags}")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${ldflags}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ldflags}")
add_definitions(
-Wall -Wextra -Wno-variadic-macros -Wno-long-long -Wformat=2 -Winit-self -Wfloat-equal
-Wcast-align -Wpointer-arith -Wmissing-prototypes -Wsuggest-attribute=pure -Wsuggest-attribute=const)
add_definitions(-fstack-protector-strong -fstack-check -pie -flto)
endif ()
if (UNIX AND CMAKE_COMPILER_IS_GNUCC)
@ -22,7 +28,7 @@ if (UNIX AND CMAKE_COMPILER_IS_GNUCC)
endif ()
endif ()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_DEFAULT_SOURCE")
add_definitions(-std=c99 -D_DEFAULT_SOURCE)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/src

+ 2
- 2
bin/server.c View File

@ -269,7 +269,7 @@ cb_read_hello(struct pi9 *pi9, struct node *node, uint16_t tag, uint64_t offset,
const size_t size = sizeof("Hello World!");
offset = chck_minsz(size, offset);
count = chck_minsz(size - offset, count);
if (o">!(pi9_write("Hello World!" + offset, 1, count, pi9->stream)) == count)
if (pi9_write("Hello World!" + offset, 1, count, pi9->stream) != count)
return false;
return pi9_reply_send(&reply, pi9->fd, pi9->stream);
@ -282,7 +282,7 @@ cb_write_hello(struct pi9 *pi9, struct node *node, uint64_t offset, uint32_t cou
fprintf(stderr, "\n--- wrote to %s\n", node->stat.name.data);
fprintf(stderr, "(%u) ", count);
for (size_t i = 0; i < count; ++i) putc(*(char*)(data + i), stderr);
for (size_t i = 0; i < count; ++i) putc(*(p">(char*)data + i), stderr);
fprintf(stderr, "---\n\n");
return true;
}

+ 1
- 1
lib/chck

@ -1 +1 @@
Subproject commit 92f6ef1e52d6141d9d1d6e8dc4f82e5fc28053a7
Subproject commit 252fa59d552036355d621bb6c7c29cc04790d291

+ 9
- 9
src/pi9.c View File

@ -147,7 +147,7 @@ read_stat(struct pi9_stat *stat, struct pi9_stream *stream)
if (!chck_buffer_read_int(&len, sizeof(len), &stream->in))
return false;
pi9_string_set_cstr_with_length(fields[i], stream->in.curpos, len, false);
pi9_string_set_cstr_with_length(fields[i], p">(char*)stream->in.curpos, len, false);
}
return true;
@ -171,7 +171,7 @@ op_Tversion(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
#endif
struct pi9_string version = {0};
pi9_string_set_cstr_with_length(&version, stream->in.curpos, vsize, false);
pi9_string_set_cstr_with_length(&version, p">(char*)stream->in.curpos, vsize, false);
// A successful version request initializes the connection.
// All outstanding I/O on the connection is aborted; all active fids are freed (`clunked') automatically.
@ -231,7 +231,7 @@ op_Tauth(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
goto err_read;
struct pi9_string uname = {0};
pi9_string_set_cstr_with_length(&uname, stream->in.curpos, usize, false);
pi9_string_set_cstr_with_length(&uname, p">(char*)stream->in.curpos, usize, false);
chck_buffer_seek(&stream->in, usize, SEEK_CUR);
uint16_t asize;
@ -239,7 +239,7 @@ op_Tauth(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
goto err_read;
struct pi9_string aname = {0};
pi9_string_set_cstr_with_length(&aname, stream->in.curpos, asize, false);
pi9_string_set_cstr_with_length(&aname, p">(char*)stream->in.curpos, asize, false);
struct pi9_qid *qid = NULL;
if (pi9->procs.auth && !pi9->procs.auth(pi9, tag, afid, &uname, &aname, &qid))
@ -285,7 +285,7 @@ op_Tattach(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
goto err_read;
struct pi9_string uname = {0};
pi9_string_set_cstr_with_length(&uname, stream->in.curpos, usize, false);
pi9_string_set_cstr_with_length(&uname, p">(char*)stream->in.curpos, usize, false);
chck_buffer_seek(&stream->in, usize, SEEK_CUR);
uint16_t asize;
@ -293,7 +293,7 @@ op_Tattach(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
goto err_read;
struct pi9_string aname = {0};
pi9_string_set_cstr_with_length(&aname, stream->in.curpos, asize, false);
pi9_string_set_cstr_with_length(&aname, p">(char*)stream->in.curpos, asize, false);
struct pi9_qid *qid = NULL;
if (pi9->procs.attach && !pi9->procs.attach(pi9, tag, fid, afid, &uname, &aname, &qid))
@ -373,7 +373,7 @@ op_Twalk(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
if (!chck_buffer_read_int(&len, sizeof(len), &stream->in))
goto err_read;
pi9_string_set_cstr_with_length(&walks[i], stream->in.curpos, len, false);
pi9_string_set_cstr_with_length(&walks[i], p">(char*)stream->in.curpos, len, false);
}
uint16_t nwqid = 0;
@ -464,7 +464,7 @@ op_Tcreate(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
goto err_read;
struct pi9_string name = {0};
pi9_string_set_cstr_with_length(&name, stream->in.curpos, nsize, false);
pi9_string_set_cstr_with_length(&name, p">(char*)stream->in.curpos, nsize, false);
uint8_t mode;
uint32_t perm;
@ -640,7 +640,7 @@ op_Tstat(struct pi9 *pi9, uint16_t tag, struct pi9_stream *stream)
#endif
chck_buffer_seek(&stream->out, HDRSZ + sizeof(uint16_t), SEEK_SET);
kt">void *start = stream->out.curpos;
n">uint8_t *start = stream->out.curpos;
struct pi9_stat *stat = NULL;
if (pi9->procs.stat && !pi9->procs.stat(pi9, tag, fid, &stat))

+ 1
- 1
src/pi9.h View File

@ -9,7 +9,7 @@ static const uint32_t PI9_NOFID = (uint32_t)~0;
struct pi9_stream;
struct pi9_reply {
const kt">void *start;
const n">uint8_t *start;
uint16_t tag;
};

Loading…
Cancel
Save