Skip to content

Commit 56ac53d

Browse files
ravage84ravage84
committed
Do not use non-existing return value of void function
1 parent f743e52 commit 56ac53d

File tree

8 files changed

+52
-26
lines changed

8 files changed

+52
-26
lines changed

‎samples/tutorials/php/1.0 PHP Configuration and Getting Started/test.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getProducts = sqlsrv_query($conn, $tsql);
1616

1717
if ($getProducts === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021

2122
$productCount = 0;
@@ -38,7 +39,8 @@
3839

3940
$insertReview = sqlsrv_query($conn, $tsql);
4041
if ($insertReview === false) {
41-
die(format_errors(sqlsrv_errors()));
42+
format_errors(sqlsrv_errors());
43+
die();
4244
}
4345

4446
while ($row = sqlsrv_fetch_array($insertReview, SQLSRV_FETCH_ASSOC)) {
@@ -51,11 +53,13 @@
5153

5254
$deleteReview = sqlsrv_prepare($conn, $tsql, $params);
5355
if ($deleteReview === false) {
54-
die(format_errors(sqlsrv_errors()));
56+
format_errors(sqlsrv_errors());
57+
die();
5558
}
5659

5760
if (sqlsrv_execute($deleteReview) === false) {
58-
die(format_errors(sqlsrv_errors()));
61+
format_errors(sqlsrv_errors());
62+
die();
5963
}
6064

6165
while ($row = sqlsrv_fetch_array($deleteReview, SQLSRV_FETCH_ASSOC)) {

‎samples/tutorials/php/2.0 PHP Server programming - Stored procedures, Transactions, and UDFs/test.php‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
$storedProc = sqlsrv_query($conn, $tsql);
1717
if ($storedProc === false) {
1818
echo 'Error creating Stored Procedure';
19-
die(format_errors(sqlsrv_errors()));
19+
format_errors(sqlsrv_errors());
20+
die();
2021
}
2122
sqlsrv_free_stmt($storedProc);
2223

@@ -26,7 +27,8 @@
2627
// Error handling
2728
if ($getProducts === false) {
2829
echo 'Error executing Stored Procedure';
29-
die(format_errors(sqlsrv_errors()));
30+
format_errors(sqlsrv_errors());
31+
die();
3032
}
3133
$productCount = 0;
3234
$ctr = 0;
@@ -49,7 +51,8 @@
4951
$storedProc = sqlsrv_query($conn, $tsql);
5052
if ($storedProc === false) {
5153
echo 'Error dropping Stored Procedure';
52-
die(format_errors(sqlsrv_errors()));
54+
format_errors(sqlsrv_errors());
55+
die();
5356
}
5457
sqlsrv_free_stmt($storedProc);
5558
?>
@@ -60,7 +63,8 @@
6063

6164
if (sqlsrv_begin_transaction($conn) === false) {
6265
echo 'Error opening connection';
63-
die(format_errors(sqlsrv_errors()));
66+
format_errors(sqlsrv_errors());
67+
die();
6468
}
6569

6670
/* Set up and execute the first query. */
@@ -101,7 +105,8 @@
101105
// Error handling
102106
if ($getProducts === false) {
103107
echo 'Error deleting the UDF';
104-
die(format_errors(sqlsrv_errors()));
108+
format_errors(sqlsrv_errors());
109+
die();
105110
}
106111
$tsql1 = 'CREATE FUNCTION dbo.ifGetTotalItems (@OrderID INT) RETURNS TABLE WITH SCHEMABINDING AS RETURN (
107112
SELECT SUM(OrderQty) AS TotalItems FROM SalesLT.SalesOrderDetail
@@ -112,7 +117,8 @@
112117
// Error handling
113118
if ($getProducts === false) {
114119
echo 'Error creating the UDF';
115-
die(format_errors(sqlsrv_errors()));
120+
format_errors(sqlsrv_errors());
121+
die();
116122
}
117123
$tsql1 = 'SELECT s.SalesOrderID, s.OrderDate, s.CustomerID, f.TotalItems
118124
FROM SalesLT.SalesOrderHeader s
@@ -122,7 +128,8 @@
122128
// Error handling
123129
if ($getProducts === false) {
124130
echo 'Error executing the UDF';
125-
die(format_errors(sqlsrv_errors()));
131+
format_errors(sqlsrv_errors());
132+
die();
126133
}
127134
$productCount = 0;
128135
$ctr = 0;

‎samples/tutorials/php/RHEL/SqlServerColumnstoreSample/columnstore.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql);
1616
echo('Sum: ');
1717
if ($getResults === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
2122
echo($row['sum'] . PHP_EOL);

‎samples/tutorials/php/RHEL/SqlServerSample/crud.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql, $params);
1616
$rowsAffected = sqlsrv_rows_affected($getResults);
1717
if ($getResults === false || $rowsAffected === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
2122

@@ -31,7 +32,8 @@
3132
$getResults = sqlsrv_query($conn, $tsql, $params);
3233
$rowsAffected = sqlsrv_rows_affected($getResults);
3334
if ($getResults === false || $rowsAffected === false) {
34-
die(format_errors(sqlsrv_errors()));
35+
format_errors(sqlsrv_errors());
36+
die();
3537
}
3638
echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
3739
sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
4446
echo('Deleting user ' . $userToDelete . PHP_EOL);
4547
$rowsAffected = sqlsrv_rows_affected($getResults);
4648
if ($getResults === false || $rowsAffected === false) {
47-
die(format_errors(sqlsrv_errors()));
49+
format_errors(sqlsrv_errors());
50+
die();
4851
}
4952
echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
5053
sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
5457
$getResults = sqlsrv_query($conn, $tsql);
5558
echo('Reading data from table' . PHP_EOL);
5659
if ($getResults === false) {
57-
die(format_errors(sqlsrv_errors()));
60+
format_errors(sqlsrv_errors());
61+
die();
5862
}
5963
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
6064
echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);

‎samples/tutorials/php/Ubuntu/SqlServerColumnstoreSample/columnstore.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql);
1616
echo('Sum: ');
1717
if ($getResults === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
2122
echo($row['sum'] . PHP_EOL);

‎samples/tutorials/php/Ubuntu/SqlServerSample/crud.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql, $params);
1616
$rowsAffected = sqlsrv_rows_affected($getResults);
1717
if ($getResults === false || $rowsAffected === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
2122

@@ -31,7 +32,8 @@
3132
$getResults = sqlsrv_query($conn, $tsql, $params);
3233
$rowsAffected = sqlsrv_rows_affected($getResults);
3334
if ($getResults === false || $rowsAffected === false) {
34-
die(format_errors(sqlsrv_errors()));
35+
format_errors(sqlsrv_errors());
36+
die();
3537
}
3638
echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
3739
sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
4446
echo('Deleting user ' . $userToDelete . PHP_EOL);
4547
$rowsAffected = sqlsrv_rows_affected($getResults);
4648
if ($getResults === false || $rowsAffected === false) {
47-
die(format_errors(sqlsrv_errors()));
49+
format_errors(sqlsrv_errors());
50+
die();
4851
}
4952
echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
5053
sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
5457
$getResults = sqlsrv_query($conn, $tsql);
5558
echo('Reading data from table' . PHP_EOL);
5659
if ($getResults === false) {
57-
die(format_errors(sqlsrv_errors()));
60+
format_errors(sqlsrv_errors());
61+
die();
5862
}
5963
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
6064
echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);

‎samples/tutorials/php/Windows/SqlServerColumnstoreSample/columnstore.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql);
1616
echo('Sum: ');
1717
if ($getResults === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
2122
echo($row['sum'] . PHP_EOL);

‎samples/tutorials/php/Windows/SqlServerSample/crud.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
$getResults = sqlsrv_query($conn, $tsql, $params);
1616
$rowsAffected = sqlsrv_rows_affected($getResults);
1717
if ($getResults === false || $rowsAffected === false) {
18-
die(format_errors(sqlsrv_errors()));
18+
format_errors(sqlsrv_errors());
19+
die();
1920
}
2021
echo($rowsAffected . ' row(s) inserted: ' . PHP_EOL);
2122

@@ -31,7 +32,8 @@
3132
$getResults = sqlsrv_query($conn, $tsql, $params);
3233
$rowsAffected = sqlsrv_rows_affected($getResults);
3334
if ($getResults === false || $rowsAffected === false) {
34-
die(format_errors(sqlsrv_errors()));
35+
format_errors(sqlsrv_errors());
36+
die();
3537
}
3638
echo($rowsAffected . ' row(s) updated: ' . PHP_EOL);
3739
sqlsrv_free_stmt($getResults);
@@ -44,7 +46,8 @@
4446
echo('Deleting user ' . $userToDelete . PHP_EOL);
4547
$rowsAffected = sqlsrv_rows_affected($getResults);
4648
if ($getResults === false || $rowsAffected === false) {
47-
die(format_errors(sqlsrv_errors()));
49+
format_errors(sqlsrv_errors());
50+
die();
4851
}
4952
echo($rowsAffected . ' row(s) deleted: ' . PHP_EOL);
5053
sqlsrv_free_stmt($getResults);
@@ -54,7 +57,8 @@
5457
$getResults = sqlsrv_query($conn, $tsql);
5558
echo('Reading data from table' . PHP_EOL);
5659
if ($getResults === false) {
57-
die(format_errors(sqlsrv_errors()));
60+
format_errors(sqlsrv_errors());
61+
die();
5862
}
5963
while ($row = sqlsrv_fetch_array($getResults, SQLSRV_FETCH_ASSOC)) {
6064
echo($row['Id'] . ' ' . $row['Name'] . ' ' . $row['Location'] . PHP_EOL);

0 commit comments

Comments
 (0)