Eliminate other variable shadowing warnings. (00bc6d3c) · Commits · kinetic-archive / kinetic-c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ ${OUT_DIR}/%.o: ${LIB_DIR}/%.c Makefile ${PUB_INC}/%.h Makefile

		# Sources with atypical paths / dependencies
		$(OUT_DIR)/socket99.o: $(SOCKET99)/socket99.c $(SOCKET99)/socket99.h
		$(CC) -c -o $@ $< $(CFLAGS) -I$(SOCKET99)
		$(CC) -c -o $@ $< $(CFLAGS) -Wno-shadow -I$(SOCKET99)
		$(OUT_DIR)/protobuf-c.o: $(PROTOBUFC)/protobuf-c/protobuf-c.c $(PROTOBUFC)/protobuf-c/protobuf-c.h
		$(CC) -c -o $@ $< -std=c99 -fPIC -g -Wall -Werror -Wno-unused-parameter $(OPTIMIZE) -I$(PROTOBUFC)
		${OUT_DIR}/kinetic_types.o: ${LIB_DIR}/kinetic_types_internal.h

src/lib/bus/bus_types.h

+18 −18

Original line number	Diff line number	Diff line
		@@ -45,13 +45,13 @@ struct boxed_msg;
		#define BUS_LOG(B, LEVEL, EVENT_KEY, MSG, UDATA) \
		do { \
		struct bus *_b = (B); \
		int level = LEVEL; \
		log_event_t event_key = EVENT_KEY; \
		char *msg = MSG; \
		void *udata = UDATA; \
		if (_b->log_level >= level && _b->log_cb != NULL) { \
		int _level = LEVEL; \
		log_event_t _event_key = EVENT_KEY; \
		char *_msg = MSG; \
		void *_udata = UDATA; \
		if (_b->log_level >= _level && _b->log_cb != NULL) { \
		bus_lock_log(_b); \
		_b->log_cb(event_key, level, msg, udata); \
		_b->log_cb(_event_key, _level, _msg, _udata); \
		bus_unlock_log(_b); \
		} \
		} while (0)
		@@ -61,23 +61,23 @@ struct boxed_msg;
		#define BUS_LOG_SNPRINTF(B, LEVEL, EVENT_KEY, UDATA, MAX_SZ, FMT, ...) \
		do { \
		struct bus *_b = (B); \
		int level = LEVEL; \
		log_event_t event_key = EVENT_KEY; \
		void *udata = UDATA; \
		if (_b->log_level >= level && _b->log_cb != NULL) { \
		int _level = LEVEL; \
		log_event_t _event_key = EVENT_KEY; \
		void *_udata = UDATA; \
		if (_b->log_level >= _level && _b->log_cb != NULL) { \
		bus_lock_log(_b); \
		char log_buf[MAX_SZ]; \
		if (MAX_SZ < snprintf(log_buf, MAX_SZ, \
		char _log_buf[MAX_SZ]; \
		if (MAX_SZ < snprintf(_log_buf, MAX_SZ, \
		FMT, __VA_ARGS__)) { \
		_b->log_cb(event_key, level, \
		_b->log_cb(_event_key, _level, \
		"snprintf failure -- " \
		__FILE__, \
		udata); \
		char line_buf[32]; \
		snprintf(line_buf, 32, "line %d\n", __LINE__); \
		_b->log_cb(event_key, level, line_buf, udata); \
		_udata); \
		char _line_buf[32]; \
		snprintf(_line_buf, 32, "line %d\n", __LINE__); \
		_b->log_cb(_event_key, _level, _line_buf, _udata); \
		} else { \
		_b->log_cb(event_key, level, log_buf, udata); \
		_b->log_cb(_event_key, _level, _log_buf, _udata); \
		} \
		bus_unlock_log(_b); \
		} \

src/lib/bus/listener.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ struct listener listener_init(struct bus b, struct bus_config *cfg) {

		if (0 != pipe(msg->pipes)) {
		for (int i = 0; i < pipe_count; i++) {
		listener_msg *msg = &l->msgs[i];
		msg = &l->msgs[i];
		syscall_close(msg->pipes[0]);
		syscall_close(msg->pipes[1]);
		}