From owner-p4-projects@FreeBSD.ORG Fri May 7 08:01:31 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B0341065670; Fri, 7 May 2010 08:01:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3FC211065677 for ; Fri, 7 May 2010 08:01:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D4F18FC0A for ; Fri, 7 May 2010 08:01:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4781V7t059924 for ; Fri, 7 May 2010 08:01:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4781VW4059922 for perforce@freebsd.org; Fri, 7 May 2010 08:01:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 7 May 2010 08:01:31 GMT Message-Id: <201005070801.o4781VW4059922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2010 08:01:31 -0000 http://p4web.freebsd.org/@@177886?ac=10 Change 177886 by hselasky@hselasky_laptop001 on 2010/05/07 08:00:59 Follow up patch. Use strong types. "int" might not always be 32-bit. PR: usb/146367 Affected files ... .. //depot/projects/usb/src/lib/libusbhid/data.c#6 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#7 edit Differences ... ==== //depot/projects/usb/src/lib/libusbhid/data.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ #include #include "usbhid.h" -int +int32_t hid_get_data(const void *p, const hid_item_t *h) { const uint8_t *buf; @@ -78,12 +78,15 @@ } void -hid_set_data(void *p, const hid_item_t *h, int data) +hid_set_data(void *p, const hid_item_t *h, int32_t data) { uint8_t *buf; uint32_t hpos; uint32_t hsize; - int i, end, offs, mask; + uint32_t mask; + int i; + int end; + int offs; buf = p; ==== //depot/projects/usb/src/lib/libusbhid/usbhid.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * */ -#include +#include typedef struct report_desc *report_desc_t; @@ -102,7 +102,7 @@ int hid_parse_usage_page(const char *name); /* Extracting/insertion of data, data.c: */ -int hid_get_data(const void *p, const hid_item_t *h); -void hid_set_data(void *p, const hid_item_t *h, int data); +int32_t hid_get_data(const void *p, const hid_item_t *h); +void hid_set_data(void *p, const hid_item_t *h, int32_t data); __END_DECLS