From 76cdf2cae0897e16ce48134dddb0d4e177829389 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 19 Nov 2012 03:03:42 +0000
Subject: Mark a function void that never returns a value. Provide proper
 return values if in non-void functions.

---
 security/netramet/distinfo                         |  6 ++-
 security/netramet/patches/patch-ai                 | 10 ++++-
 .../patches/patch-src_manager_fd__extract.c        | 21 ++++++++++
 .../netramet/patches/patch-src_meter_lfapmet.c     | 45 ++++++++++++++++++++++
 4 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 security/netramet/patches/patch-src_manager_fd__extract.c
 create mode 100644 security/netramet/patches/patch-src_meter_lfapmet.c

(limited to 'security/netramet')

diff --git a/security/netramet/distinfo b/security/netramet/distinfo
index c2db39dbba6..2c172636bbc 100644
--- a/security/netramet/distinfo
+++ b/security/netramet/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/12/28 05:13:23 obache Exp $
+$NetBSD: distinfo,v 1.9 2012/11/19 03:03:42 joerg Exp $
 
 SHA1 (NeTraMet44.tar.gz) = 7848d6aa81b29966127fc78afcd9375c60441a91
 RMD160 (NeTraMet44.tar.gz) = f10185263adedf4e8184741998482992a35098e1
@@ -11,5 +11,7 @@ SHA1 (patch-ae) = c20b2ca1d22330c71eee990d416ca01e7751ddac
 SHA1 (patch-af) = b12113de41be1afc2c815f6fd103f6bcd7025c79
 SHA1 (patch-ag) = 84d37e1d61a915355816c24321d7b2ba0169b3e0
 SHA1 (patch-ah) = 9dc2a7095e4643076f56b3117d7ae733561334e3
-SHA1 (patch-ai) = 468f84420c3d49dc1503cbe5f279080b4546f2cc
+SHA1 (patch-ai) = 4cb01ff0df260782c52f16ce2d295cb96cfadf27
 SHA1 (patch-aj) = 37a17df225a11ba568b3e37f6c1729bac7b6aee4
+SHA1 (patch-src_manager_fd__extract.c) = 17739397a7298ffe2a85b91678db904b9d5a351a
+SHA1 (patch-src_meter_lfapmet.c) = 1b8f71a8be25d116b175dba72d34d22500832c61
diff --git a/security/netramet/patches/patch-ai b/security/netramet/patches/patch-ai
index f5e2b41d980..7f86c6905b6 100644
--- a/security/netramet/patches/patch-ai
+++ b/security/netramet/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2005/12/08 18:02:07 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2012/11/19 03:03:42 joerg Exp $
 
 --- src/meter/meter_ux.c.orig	2005-12-08 17:57:11.000000000 +0000
 +++ src/meter/meter_ux.c
@@ -10,3 +10,11 @@ $NetBSD: patch-ai,v 1.1 2005/12/08 18:02:07 joerg Exp $
  int snmp_dump_packet = 0;
  #define MXINTERFACES 4
  
+@@ -2848,6 +2847,7 @@ void one_second_process(void)
+ #endif
+    }
+ 
++void
+ handle_keyboard()
+ {
+    char kb_buf[25];
diff --git a/security/netramet/patches/patch-src_manager_fd__extract.c b/security/netramet/patches/patch-src_manager_fd__extract.c
new file mode 100644
index 00000000000..5627065426d
--- /dev/null
+++ b/security/netramet/patches/patch-src_manager_fd__extract.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_manager_fd__extract.c,v 1.1 2012/11/19 03:03:42 joerg Exp $
+
+--- src/manager/fd_extract.c.orig	2012-11-18 23:38:16.000000000 +0000
++++ src/manager/fd_extract.c
+@@ -68,6 +68,7 @@
+ #include <ntm_conf.h>
+ #endif
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -164,7 +165,7 @@ struct col_info *scan_col(void)
+       n = getnbr();
+       }
+    if (n == RF_STATS) {
+-      if (!nexttoken()) return;
++      if (!nexttoken()) return NULL;
+       for (a = 0; a != 3; ++a) {
+          scbuf[a] = ic;  nextchar();
+          }
diff --git a/security/netramet/patches/patch-src_meter_lfapmet.c b/security/netramet/patches/patch-src_meter_lfapmet.c
new file mode 100644
index 00000000000..51acb460237
--- /dev/null
+++ b/security/netramet/patches/patch-src_meter_lfapmet.c
@@ -0,0 +1,45 @@
+$NetBSD: patch-src_meter_lfapmet.c,v 1.1 2012/11/19 03:03:42 joerg Exp $
+
+--- src/meter/lfapmet.c.orig	2012-11-18 23:39:30.000000000 +0000
++++ src/meter/lfapmet.c
+@@ -1115,13 +1115,13 @@ int handleFUN(struct interface_info *pi)
+ 				ies_len--;
+ 				for (i=0;i<ies_len;i++) free(ies[i]);
+ 				if (ies!=NULL) free(ies);	
+-				return;
++				return FALSE;
+ 			}
+ 			ies[ies_len-1] = malloc(getIELengthIncl(ie));
+ 			if (ies[ies_len-1]==NULL)
+ 			{
+ 				debug("handleFUN(): malloc failed!\n",LFAPMET_DBG_ERRORS);
+-				return;
++				return FALSE;
+ 			}
+ 			memcpy(ies[ies_len-1],ie,getIELengthIncl(ie));
+ 			ie = getNextIE(lfap, ie, getLFAPMessageLengthIncl(lfap));
+@@ -1132,13 +1132,13 @@ int handleFUN(struct interface_info *pi)
+ 		{	/* don't forget to free allocated memory ! */
+ 			for (i=0;i<ies_len;i++) free(ies[i]);
+ 			if (ies!=NULL) free(ies);
+-			return;
++			return FALSE;
+ 		}
+ 		if (getIEType(ie) != LFAP_IE_FLOW_ID)
+ 		{
+ 			for (i=0;i<ies_len;i++) free(ies[i]);
+ 			if (ies!=NULL) free(ies);
+-			return;
++			return FALSE;
+ 		}
+ 	}
+ 
+@@ -1162,7 +1162,7 @@ int handleFUN(struct interface_info *pi)
+ 				{
+ 					for (i=0;i<ies_len;i++) free(ies[i]);
+ 					if (ies!=NULL) free(ies);
+-					return;
++					return FALSE;
+ 				}
+ 				fs = fi->fs_pp[i];
+ 				/* see if there's a FAS prefix, set it if so */
-- 
cgit v1.2.3