ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/ihost/ihost.c

Comparing projects/cms/source/ihost/ihost.c (file contents):
Revision 1.33 by pajs, Sat Mar 8 20:41:46 2003 UTC vs.
Revision 1.36 by tdb, Mon Mar 10 08:18:17 2003 UTC

#	Line 77 | Line 77 | ihost_config_t ihost_config;
77
78		extern int errno;
79
80	<	/* Taken from the openssh code. Its licence included in function.*/
81	<	//#ifndef HAVE_STRLCAT
80	>	/* Taken from the OpenSSH code. Its licence included in function.*/
81	>	#ifndef HAVE_STRLCAT
82
83		/*
84		* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
#	Line 106 | Line 106 | extern int errno;
106		* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
107		* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
108		*/
109	+
110		/*
111		* Appends src to string dst of size siz (unlike strncat, siz is the
112		* full size of dst, not space left).  At most siz-1 characters
#	Line 144 | Line 145 | strlcat(dst, src, siz)
145		return(dlen + (s - src));       /* count does not include NUL */
146		}
147
148	<	//#endif
148	>	#endif
149	>	/* End strlcat function taken from OpenSSH */
150
149	–
151		void log_msg(int level, char *format, ...){
152		int cur_errno;
153		va_list ap;
#	Line 292 | Line 293 | int ihost_getconfig(ihost_state_t *ihost_state){
293		time_t config_ttl=0;
294
295		if((tcp_con=create_tcp_connection(ihost_state->filtermanager_host, ihost_state->filtermanager_port))==NULL){
296	<	goto error;
296	>	return -1;
297		}
298
299		if(ihost_state->file_list!=NULL || ihost_state->last_modified!=NULL){
#	Line 577 | Line 578 | int get_system_stats(int seq_no, ihost_state_t *ihost_
578		y=page_stats->pages_pageout;
579		}
580		snprintf(tmp, size, \
581	<	"<pages><swapins>%lld</swapins><swapouts>%lld</swapouts></pages>", \
581	>	"<pages><pageins>%lld</pageins><pageouts>%lld</pageouts></pages>", \
582		x, \
583		y);
584

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines