Merge pull request #266 from muesli/dbus-linter-fixes

dbus: Fixed linter warnings

Author: lucab

dbus/methods_test.go

@@ -613,7 +613,7 @@ func TestEnableDisableUnit(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if install != false {
+	if install {
 		t.Log("Install was true")
 	}
 
@@ -668,11 +668,9 @@ func TestSystemState(t *testing.T) {
 	case "offline":
 	case "unknown":
 		// valid systemd state - do nothing
-		break
 
 	default:
 		t.Fatalf("unexpected property value: %v", val)
-		break
 	}
 }
 
@@ -1092,7 +1090,7 @@ func checkTransientUnitRequisite(t *testing.T, trTarget TrUnitProp, trDep TrUnit
 	// Start the target unit
 	err := runStartTrUnit(t, conn, trTarget)
 	if err == nil {
-		return fmt.Errorf("Unit %s is expected to fail, but succeeded.", trTarget.name)
+		return fmt.Errorf("Unit %s is expected to fail, but succeeded", trTarget.name)
 	}
 
 	unit := getUnitStatusSingle(conn, trTarget.name)
@@ -1112,7 +1110,7 @@ func checkTransientUnitRequisiteOv(t *testing.T, trTarget TrUnitProp, trDep TrUn
 	// Start the target unit
 	err := runStartTrUnit(t, conn, trTarget)
 	if err == nil {
-		return fmt.Errorf("Unit %s is expected to fail, but succeeded.", trTarget.name)
+		return fmt.Errorf("Unit %s is expected to fail, but succeeded", trTarget.name)
 	}
 
 	unit := getUnitStatusSingle(conn, trTarget.name)
@@ -1476,7 +1474,7 @@ func TestMaskUnmask(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if install != false {
+	if install {
 		t.Log("Install was true")
 	}
 

dbus/set.go

@@ -36,7 +36,7 @@ func (s *set) Length() int {
 }
 
 func (s *set) Values() (values []string) {
-	for val, _ := range s.data {
+	for val := range s.data {
 		values = append(values, val)
 	}
 	return

dbus/subscription.go

@@ -37,22 +37,12 @@ func (c *Conn) Subscribe() error {
 	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
 		"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'")
 
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
 }
 
 // Unsubscribe this connection from systemd dbus events.
 func (c *Conn) Unsubscribe() error {
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
 }
 
 func (c *Conn) dispatch() {