journald-kmsg.c		journald-kmsg.c
	skipping to change at line 26		skipping to change at line 26
	Lesser General Public License for more details.		Lesser General Public License for more details.
	You should have received a copy of the GNU Lesser General Public License		You should have received a copy of the GNU Lesser General Public License
	along with systemd; If not, see <http://www.gnu.org/licenses/>.		along with systemd; If not, see <http://www.gnu.org/licenses/>.
	***/		***/
	#include <unistd.h>		#include <unistd.h>
	#include <sys/epoll.h>		#include <sys/epoll.h>
	#include <fcntl.h>		#include <fcntl.h>
	#include <sys/mman.h>		#include <sys/mman.h>
			#include <sys/socket.h>
	#include <systemd/sd-messages.h>		#include <systemd/sd-messages.h>
	#include <libudev.h>		#include <libudev.h>
	#include "journald.h"		#include "journald.h"
	#include "journald-kmsg.h"		#include "journald-kmsg.h"
	#include "journald-syslog.h"		#include "journald-syslog.h"
	void server_forward_kmsg(		void server_forward_kmsg(
	Server *s,		Server *s,
	skipping to change at line 361		skipping to change at line 362
	int r;		int r;
	assert(s);		assert(s);
	if (s->dev_kmsg_fd < 0)		if (s->dev_kmsg_fd < 0)
	return 0;		return 0;
	if (!s->dev_kmsg_readable)		if (!s->dev_kmsg_readable)
	return 0;		return 0;
	log_info("Flushing /dev/kmsg...");		log_debug("Flushing /dev/kmsg...");
	for (;;) {		for (;;) {
	r = server_read_dev_kmsg(s);		r = server_read_dev_kmsg(s);
	if (r < 0)		if (r < 0)
	return r;		return r;
	if (r == 0)		if (r == 0)
	break;		break;
	}		}
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/